Skip to content

Commit

Permalink
Task: upgrade gems to latest minor.patch + Rails 4.2 (#912)
Browse files Browse the repository at this point in the history
Upgrade gems to their latest patch version
  • Loading branch information
ysbaddaden authored Nov 13, 2023
2 parents 3c4aec1 + c75b31c commit 0de95ab
Show file tree
Hide file tree
Showing 31 changed files with 394 additions and 264 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ADD Gemfile.lock /app/
RUN bundle install --jobs 3 --deployment --without development test

# Default environment settings
ENV RAILS_SERVE_STATIC_FILES true
ENV LOG_TO_STDOUT true
ENV INSTEDD_THEME //theme.instedd.org
ENV RAILS_ENV production
Expand Down
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# framework
gem 'rails', '~> 4.1.15'
gem 'rails', '~> 4.2.11'

# services
gem "elasticsearch", '~> 1.0.17'
Expand Down Expand Up @@ -49,6 +49,9 @@ gem 'treetop', '1.4.15'
gem 'uuidtools'
gem 'will_paginate'

# deprecated (to fix upgrades)
gem "loofah", "2.20.0" if RUBY_VERSION.to_f < 2.5

# templates
gem 'haml-rails', '~> 0.4'
gem 'haml-magic-translations'
Expand All @@ -57,7 +60,7 @@ gem 'haml-magic-translations'
gem 'coffee-rails', '~> 4.0.1'
gem 'jquery-rails', "~> 2.0.2"
gem 'lodash-rails'
gem 'knockoutjs-rails'
gem 'knockoutjs-rails', '~> 3.2.0'
gem 'rails-assets-knockout-sortable', :source => 'https://rails-assets.org'
gem 'sass-rails', '~> 4.0.1'
gem 'uglifier', '>= 2.5.0'
Expand All @@ -79,8 +82,7 @@ group :test do
gem 'resque_spec'
gem 'selenium-webdriver', '3.141.0' # locked until we upgrade to capybara 3.x
gem 'shoulda-matchers', require: false
gem 'simplecov'
gem 'simplecov-rcov'
gem 'simplecov', require: false
gem 'spring-commands-rspec'
gem 'timecop'
end
Expand Down
Loading

0 comments on commit 0de95ab

Please sign in to comment.