Skip to content
This repository has been archived by the owner on Jun 27, 2020. It is now read-only.

Commit

Permalink
Upgrades Ruby to 2.3 and Rails to 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dchandekstark authored and Cory Lown committed Jan 10, 2017
1 parent 3d6feda commit babd028
Show file tree
Hide file tree
Showing 15 changed files with 303 additions and 237 deletions.
1 change: 1 addition & 0 deletions .ruby-version
@@ -0,0 +1 @@
2.3.1
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -4,7 +4,7 @@ before_install:
- sudo apt-get install -qq libclamav6 libclamav-dev clamav
- gem install bundler
rvm:
- 2.1.5
- 2.3.1
before_script:
- cp config/log4r.yml.sample config/log4r.yml
- git clone https://github.com/duke-libraries/ddr-portals.git
Expand Down
14 changes: 10 additions & 4 deletions Gemfile
@@ -1,11 +1,12 @@
source 'https://rubygems.org'
ruby '2.3.1'

gem 'rails', '~> 4.1.13'
gem 'blacklight', '5.16'
gem 'rails', '4.2.7'
gem 'blacklight', '~> 5.16'
gem 'hydra-head', '~> 7.2.0'
gem 'ddr-alerts', '~> 1.0.0'
gem 'ddr-alerts', git: 'https://github.com/duke-libraries/ddr-alerts', ref: '01408a82f13292b655b3c561688cf824cbd14549'
gem 'devise' # must be explicitly required
gem 'ddr-models', '2.5.0'
gem 'ddr-models', git: 'https://github.com/duke-libraries/ddr-models', ref: 'e0ed623a3722ca9583f2531f97dd5f20c126293d'

gem 'log4r'
gem 'bootstrap-sass', '~> 3.3.4'
Expand All @@ -29,6 +30,11 @@ gem 'nokogiri'
gem 'edtf-humanize', '~> 0.0.7'
gem 'rails_autolink'

# Rails 4.2+
gem 'responders', '~> 2.0'
gem 'web-console', '~> 2.0', group: :development
gem 'sprockets-rails', '>= 2.1.4'

gem 'sdoc', '~> 0.4.0', group: :doc

group :development do
Expand Down

0 comments on commit babd028

Please sign in to comment.