Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Rails 6 #179

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
language: ruby
sudo: false
cache: bundler
addons:
postgresql: '10'
services:
- mysql
branches:
only:
- master
bundler_args: --without development
before_script:
- "sh -e /etc/init.d/xvfb start"
- "bundle exec rake refinery:testing:dummy_app"
script:
- "DISPLAY=:99.0 bundle exec rspec spec"
notifications:
email: true
irc:
use_notice: true
skip_join: true
channels:
- "irc.freenode.org#refinerycms"
campfire:
on_success: always
on_failure: always
rooms:
- secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
webhooks:
- https://webhooks.gitter.im/e/b5d48907cdc89864b874
env:
- DB=postgresql
- DB=mysql
rvm:
- 2.5.1
- 2.4.4
- 2.3.7
- 2.6

2 changes: 1 addition & 1 deletion refinerycms-inquiries.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.add_dependency 'mobility'
s.add_dependency 'refinerycms-settings', '~> 4.0'
s.add_dependency 'filters_spam', '~> 0.2'
s.add_dependency 'actionmailer', ['>= 5.1.0', '< 5.3']
s.add_dependency 'actionmailer', ['>= 5.1.0', '< 7']
s.add_dependency 'httpclient'

s.cert_chain = [File.expand_path("../certs/parndt.pem", __FILE__)]
Expand Down