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.

Sign up for GitHub

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

Upgrade Rails to 4.2, Ruby to 2.4.6 #184

Merged
merged 14 commits into from
Jun 18, 2020
Merged

Upgrade Rails to 4.2, Ruby to 2.4.6 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
84c5246
Rails 4.2 ugprade, update AWS SDK, remove rack-zippy
pjsier Jan 31, 2018
090f5a6
Upgrade Ruby to 2.4.6, disable capybara
pjsier Jun 16, 2019
95a9faf
Resolve merge conflicts
pjsier Jun 16, 2019
efa1204
Update Ruby version in .travis.yml
pjsier Jun 16, 2019
716d0e9
Fix AWS config setup
pjsier Jun 16, 2019
1bd83d5
updated Gemfile.lock
YaxelPerez Apr 7, 2020
52eea90
Merge branch 'master' into 126-rails-42
YaxelPerez Apr 7, 2020
9455da0
Reenable capybara for tests
May 19, 2020
81d5368
Merge branch 'master' into 126-rails-42
May 19, 2020
2c0b893
Merge the new tests from master
May 26, 2020
ffd47a6
Merge branch 'master' into 126-rails-42
May 27, 2020
9cbe8d4
Merge branch 'master' into 126-rails-42
Jun 18, 2020
bacc435
Remove clean_empty_strings spec
Jun 18, 2020
6621247
Make shift spec more reliable
Jun 18, 2020
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: ruby
sudo: false
cache: bundler
rvm:
- 2.2.3
- 2.4.6
bundler_args: --without development
before_install:
- sudo apt-get update
Expand Down
18 changes: 9 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
source 'https://rubygems.org'
ruby "2.2.3"
ruby "2.4.6"
#ruby-gemset=arcdata

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '< 4.2'
gem 'rails', '~> 4.2'
gem 'squeel', '~> 1.2.1', github: 'activerecord-hackery/squeel'
gem 'puma'
gem 'rack-rewrite'
gem 'pg', '~> 0.2'

gem 'arcdata_core', github: 'redcross/arcdata_core'
gem 'connect', github: 'redcross/openid-connect-engine'
gem 'arcdata_core', github: 'redcross/arcdata_core', branch: 'upgrade/rails-42'
gem 'connect', github: 'redcross/openid-connect-engine', branch: 'rails-42-upgrade'

gem 'activerecord-postgresql-adapter'
gem 'activerecord-import'

gem 'sass-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'haml-rails'
gem 'haml-rails', "~> 0.5.0"
gem "less-rails", "~> 2.5" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
gem "sprockets", "~> 2.11.0"

Expand All @@ -44,7 +45,7 @@ gem "kaminari"
gem "paper_trail", '~> 3.0'
gem "assignable_values"
gem 'bootstrap-kaminari-views'
gem 'paperclip', '~> 4.2'
gem 'paperclip'
gem 'threach'
gem 'dotiw', '~> 2.0'

Expand All @@ -61,12 +62,12 @@ gem 'nokogiri'
# Monitoring/Alerting
gem 'sentry-raven', '~> 0.12.2'
gem 'hashie', '~>2.0.0'
gem 'newrelic_rpm'
gem 'newrelic_rpm', '< 4'

gem 'httparty'
gem 'couchrest'
gem 'bitly'
gem 'aws-sdk'
gem 'aws-sdk', '< 3.0'
gem "memcachier"
gem "dalli"
gem "twilio-ruby"
Expand All @@ -84,7 +85,6 @@ gem 'wkhtmltopdf-binary', github: 'dwa012/wkhtmltopdf-binary', group: :developme

group :staging, :production do
gem 'rails_12factor'
gem 'rack-zippy'
end

# Gems used only for assets and not required
Expand Down
Loading