Skip to content

Commit

Permalink
Relax the Rails version constraint after a DeppBot change.
Browse files Browse the repository at this point in the history
  • Loading branch information
lowjoel committed Apr 7, 2016
1 parent 6e264b6 commit 711ef3a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'tzinfo-data', platforms: [:mswin, :mswin64]
gem 'bundler', '>= 1.10.3'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.2.5.2'
gem 'rails', '~> 4.2.0', '>= 4.2.5.2'

# Use PostgreSQL for the backend
gem 'pg', '>= 0.18.2'
Expand Down
64 changes: 32 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,42 +35,42 @@ GEM
remote: https://rubygems.org/
specs:
ace-rails-ap (4.0.2)
actionmailer (4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
actionmailer (4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5.2)
actionview (= 4.2.5.2)
activesupport (= 4.2.5.2)
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5.2)
activesupport (= 4.2.5.2)
actionview (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_record-acts_as (1.0.8)
activerecord (~> 4, >= 4.1.2)
activesupport (~> 4)
activejob (4.2.5.2)
activesupport (= 4.2.5.2)
activejob (4.2.6)
activesupport (= 4.2.6)
globalid (>= 0.3.0)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
activemodel (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
activerecord (4.2.5.2)
activemodel (= 4.2.5.2)
activesupport (= 4.2.5.2)
activerecord (4.2.6)
activemodel (= 4.2.6)
activesupport (= 4.2.6)
arel (~> 6.0)
activerecord-userstamp (3.0.4)
activerecord (~> 4.2)
activesupport (~> 4.2)
activesupport (4.2.5.2)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand Down Expand Up @@ -297,16 +297,16 @@ GEM
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
actionmailer (= 4.2.5.2)
actionpack (= 4.2.5.2)
actionview (= 4.2.5.2)
activejob (= 4.2.5.2)
activemodel (= 4.2.5.2)
activerecord (= 4.2.5.2)
activesupport (= 4.2.5.2)
rails (4.2.6)
actionmailer (= 4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
activemodel (= 4.2.6)
activerecord (= 4.2.6)
activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2)
railties (= 4.2.6)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -322,9 +322,9 @@ GEM
loofah (~> 2.0)
rails_utils (4.0.0)
rails (>= 3.2)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
Expand Down Expand Up @@ -428,7 +428,7 @@ GEM
schema_plus_views (0.3.0)
activerecord (~> 4.2)
schema_plus_core (~> 0.1)
schema_validations (2.1.0)
schema_validations (2.1.1)
activerecord (~> 4.2, >= 4.2.1)
schema_plus_columns
valuable
Expand Down Expand Up @@ -461,7 +461,7 @@ GEM
railties (>= 3.1, < 5.0)
slim (~> 3.0)
spring (1.6.4)
sprockets (3.5.2)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
Expand Down Expand Up @@ -573,7 +573,7 @@ DEPENDENCIES
pg (>= 0.18.2)
poltergeist
puma
rails (~> 4.2.5.2)
rails (~> 4.2.0, >= 4.2.5.2)
rails-dev-boost!
rails-flog
rails_utils (>= 3.3.3)
Expand Down

0 comments on commit 711ef3a

Please sign in to comment.