Skip to content

Commit

Permalink
Revert "Merge pull request #720 from dsander/rails-4.2"
Browse files Browse the repository at this point in the history
This reverts commit b43ba81, reversing
changes made to 45eade1.
  • Loading branch information
cantino committed Mar 23, 2015
1 parent 49eb434 commit 644f36f
Show file tree
Hide file tree
Showing 10 changed files with 127 additions and 164 deletions.
18 changes: 9 additions & 9 deletions Gemfile
Expand Up @@ -50,7 +50,7 @@ gem 'protected_attributes', '~>1.0.8' # This must be loaded before some other ge
gem 'ace-rails-ap', '~> 2.0.1'
gem 'bootstrap-kaminari-views', '~> 0.0.3'
gem 'bundler', '>= 1.5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'daemons', '~> 1.1.9'
gem 'delayed_job', '~> 4.0.0'
gem 'delayed_job_active_record', '~> 4.0.0'
Expand All @@ -59,7 +59,7 @@ gem 'em-http-request', '~> 1.1.2'
gem 'faraday', '~> 0.9.0'
gem 'faraday_middleware'
gem 'feed-normalizer'
gem 'font-awesome-sass', '~> 4.3'
gem 'font-awesome-sass'
gem 'foreman', '~> 0.63.0'
# geokit-rails doesn't work with geokit 1.8.X but it specifies ~> 1.5
# in its own Gemfile.
Expand All @@ -76,9 +76,9 @@ gem 'mysql2', '~> 0.3.16'
gem 'multi_xml'
gem 'nokogiri', '~> 1.6.4'
gem 'omniauth'
gem 'rails' , '4.2.1'
gem 'rails' , '4.1.8'
gem 'rufus-scheduler', '~> 3.0.8', require: false
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 4.0.0'
gem 'select2-rails', '~> 3.5.4'
gem 'spectrum-rails'
gem 'string-scrub' # for ruby <2.1
Expand All @@ -101,12 +101,12 @@ group :development, :test do
gem 'dotenv-rails'
gem 'pry'
gem 'rr'
gem 'rspec', '~> 3.2'
gem 'rspec-collection_matchers', '~> 1.1.0'
gem 'rspec-rails', '~> 3.1'
gem 'rspec-html-matchers', '~> 0.7'
gem 'rspec', '~> 3.0'
gem 'rspec-collection_matchers', '~> 1.0.0'
gem 'rspec-rails', '~> 3.0.1'
gem 'rspec-html-matchers', '~> 0.6.1'
gem 'shoulda-matchers'
gem 'spring', '~> 1.3.0'
gem 'spring', '~> 1.3.2'
gem 'spring-commands-rspec'
gem 'vcr'
gem 'webmock', '~> 1.17.4', require: false
Expand Down

0 comments on commit 644f36f

Please sign in to comment.