Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump rails to latest patch 4.1 release. (4.1.10) 

We should be using the latest patch release of the current supported
version.
Also this adds a more explicit version of rails on the Gemfile. This is
will help to test on rails 4.2 and master.
This commit is contained in:
Arthur Neves 2015-04-24 15:36:46 -04:00
parent e17ea2e787
commit e6655e7d7e
No known key found for this signature in database
GPG Key ID: 04A390FB1E433E17
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -74,9 +74,9 @@ if rails_master?
gem 'rails-observers', git: 'https://github.com/SamSaffron/rails-observers.git' gem 'rails-observers', git: 'https://github.com/SamSaffron/rails-observers.git'
gem 'seed-fu', git: 'https://github.com/SamSaffron/seed-fu.git', branch: 'discourse' gem 'seed-fu', git: 'https://github.com/SamSaffron/seed-fu.git', branch: 'discourse'
else else
gem 'seed-fu', '~> 2.3.3' gem 'rails', '~> 4.1.10'
gem 'rails'
gem 'rails-observers' gem 'rails-observers'
gem 'seed-fu', '~> 2.3.3'
end end
gem 'actionpack-action_caching' gem 'actionpack-action_caching'

58
Gemfile.lock
View File

@ -7,31 +7,31 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
CFPropertyList (2.2.8) CFPropertyList (2.2.8)
actionmailer (4.1.9) actionmailer (4.1.10)
actionpack (= 4.1.9) actionpack (= 4.1.10)
actionview (= 4.1.9) actionview (= 4.1.10)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.9) actionpack (4.1.10)
actionview (= 4.1.9) actionview (= 4.1.10)
activesupport (= 4.1.9) activesupport (= 4.1.10)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionpack-action_caching (1.1.1) actionpack-action_caching (1.1.1)
actionpack (>= 4.0.0, < 5.0) actionpack (>= 4.0.0, < 5.0)
actionview (4.1.9) actionview (4.1.10)
activesupport (= 4.1.9) activesupport (= 4.1.10)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
active_model_serializers (0.8.2) active_model_serializers (0.8.2)
activemodel (>= 3.0) activemodel (>= 3.0)
activemodel (4.1.9) activemodel (4.1.10)
activesupport (= 4.1.9) activesupport (= 4.1.10)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.9) activerecord (4.1.10)
activemodel (= 4.1.9) activemodel (= 4.1.10)
activesupport (= 4.1.9) activesupport (= 4.1.10)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.9) activesupport (4.1.10)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -221,13 +221,13 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.5.1) minitest (5.6.0)
mocha (1.1.0) mocha (1.1.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
mock_redis (0.14.0) mock_redis (0.14.0)
moneta (0.8.0) moneta (0.8.0)
msgpack (0.5.11) msgpack (0.5.11)
multi_json (1.10.1) multi_json (1.11.0)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mustache (0.99.8) mustache (0.99.8)
@ -305,21 +305,21 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.9) rails (4.1.10)
actionmailer (= 4.1.9) actionmailer (= 4.1.10)
actionpack (= 4.1.9) actionpack (= 4.1.10)
actionview (= 4.1.9) actionview (= 4.1.10)
activemodel (= 4.1.9) activemodel (= 4.1.10)
activerecord (= 4.1.9) activerecord (= 4.1.10)
activesupport (= 4.1.9) activesupport (= 4.1.10)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.9) railties (= 4.1.10)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-observers (0.1.2) rails-observers (0.1.2)
activemodel (~> 4.0) activemodel (~> 4.0)
railties (4.1.9) railties (4.1.10)
actionpack (= 4.1.9) actionpack (= 4.1.10)
activesupport (= 4.1.9) activesupport (= 4.1.10)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.13.0) raindrops (0.13.0)
@ -430,7 +430,7 @@ GEM
eventmachine (~> 1.0) eventmachine (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.7.3) timecop (0.7.3)
timers (4.0.1) timers (4.0.1)
@ -513,7 +513,7 @@ DEPENDENCIES
qunit-rails qunit-rails
rack-mini-profiler rack-mini-profiler
rack-protection rack-protection
rails rails (~> 4.1.10)
rails-observers rails-observers
rails_multisite! rails_multisite!
rake rake