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

Upgrade Ruby, Rails and various gems #3

Merged
merged 5 commits into from
Nov 4, 2019
Merged
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ config/database.yml

# Don't include config file
/config/emily.yml
/config/sunspot.yml
/config/secrets.yml
/config/cable.yml

# Ignore compiled assets
public/assets
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.2
ruby-2.5.1
50 changes: 27 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,58 +1,62 @@
source 'https://rubygems.org'

gem 'rails', '3.2.22.2'
gem 'rails', '5.2.0'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'rake', '10.5.0'
gem 'rake', '~> 13.0.0'

gem 'pg', '0.18.1'
gem 'nokogiri'
gem 'sunspot_rails', '~> 2.0.0'
gem 'sunspot_solr', '~> 2.0.0'
gem 'activerecord-import'
gem 'amatch'
gem 'ancestry'
gem 'autoprefixer-rails'
gem 'baby_squeel'
gem 'bootsnap', require: false
gem 'dalli'
gem 'devise'
gem 'exception_notification'
gem 'flickraw'
gem 'squeel'
gem 'the_sortable_tree'
gem 'formtastic'
gem 'cache_digests'
gem 'memcache-client'
gem 'activerecord-import'
gem 'rubyzip', require: 'zip'
gem 'amatch'
gem 'htmlentities'
gem 'progressbar', '~> 1.0'
gem 'listen'
gem 'memcache-client'
gem 'naturally', '1.3.2'
gem 'roman-numerals'
gem 'exception_notification'
gem 'autoprefixer-rails'
gem 'oai_repository', :git => 'https://github.com/berkmancenter/oai_repository', :ref => 'ab3e018f59c1c53dcef4736476a56bac179e45f0'
gem 'ancestry'
gem 'nokogiri'
gem 'oai_repository', :git => 'https://github.com/berkmancenter/oai_repository'
gem 'pg'
gem 'polyamorous', '~> 1.3.3'
gem 'progressbar', '~> 1.0'
gem 'protected_attributes_continued'
gem 'ranked-model'
gem 'roman-numerals'
gem 'rubyzip', require: 'zip'
gem 'sunspot_rails', '~> 2.5.0'
gem 'sunspot_solr', '~> 2.5.0'
gem 'the_sortable_tree', '2.6.1'

# For MODS generation
gem 'builder'

group :development, :test do
gem 'rspec-rails'
gem 'annotate'
gem 'rspec-rails'
gem 'ruby-prof'
gem 'test-unit'
#gem 'sql-logging'
end

group :test do
gem 'capybara'
gem 'poltergeist'
gem 'factory_girl_rails'
gem 'poltergeist'
end

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'coffee-rails', '~> 5.0.0'
gem 'sass-rails', '~> 5.1.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby
Expand Down
Loading