mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 17:46:05 -05:00
rails 4 to use github branch so we get all fixes (in particular order fixes)
This commit is contained in:
parent
b31f26ba01
commit
75345c1f8f
2 changed files with 47 additions and 41 deletions
2
Gemfile
2
Gemfile
|
@ -33,7 +33,7 @@ if rails4?
|
||||||
end
|
end
|
||||||
|
|
||||||
if rails4?
|
if rails4?
|
||||||
gem 'rails', '4.0.0'
|
gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '4-0-stable'
|
||||||
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
|
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
|
||||||
gem 'rails-observers'
|
gem 'rails-observers'
|
||||||
gem 'actionpack-action_caching'
|
gem 'actionpack-action_caching'
|
||||||
|
|
|
@ -31,6 +31,48 @@ GIT
|
||||||
specs:
|
specs:
|
||||||
fabrication (2.7.2)
|
fabrication (2.7.2)
|
||||||
|
|
||||||
|
GIT
|
||||||
|
remote: git://github.com/rails/rails.git
|
||||||
|
revision: 58cd859caa49ba36cff382522c51e4ed85009017
|
||||||
|
branch: 4-0-stable
|
||||||
|
specs:
|
||||||
|
actionmailer (4.0.0)
|
||||||
|
actionpack (= 4.0.0)
|
||||||
|
mail (~> 2.5.4)
|
||||||
|
actionpack (4.0.0)
|
||||||
|
activesupport (= 4.0.0)
|
||||||
|
builder (~> 3.1.0)
|
||||||
|
erubis (~> 2.7.0)
|
||||||
|
rack (~> 1.5.2)
|
||||||
|
rack-test (~> 0.6.2)
|
||||||
|
activemodel (4.0.0)
|
||||||
|
activesupport (= 4.0.0)
|
||||||
|
builder (~> 3.1.0)
|
||||||
|
activerecord (4.0.0)
|
||||||
|
activemodel (= 4.0.0)
|
||||||
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
|
activesupport (= 4.0.0)
|
||||||
|
arel (~> 4.0.0)
|
||||||
|
activesupport (4.0.0)
|
||||||
|
i18n (~> 0.6, >= 0.6.4)
|
||||||
|
minitest (~> 4.2)
|
||||||
|
multi_json (~> 1.3)
|
||||||
|
thread_safe (~> 0.1)
|
||||||
|
tzinfo (~> 0.3.37)
|
||||||
|
rails (4.0.0)
|
||||||
|
actionmailer (= 4.0.0)
|
||||||
|
actionpack (= 4.0.0)
|
||||||
|
activerecord (= 4.0.0)
|
||||||
|
activesupport (= 4.0.0)
|
||||||
|
bundler (>= 1.3.0, < 2.0)
|
||||||
|
railties (= 4.0.0)
|
||||||
|
sprockets-rails (~> 2.0.0)
|
||||||
|
railties (4.0.0)
|
||||||
|
actionpack (= 4.0.0)
|
||||||
|
activesupport (= 4.0.0)
|
||||||
|
rake (>= 0.8.7)
|
||||||
|
thor (>= 0.18.1, < 2.0)
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/sporkrb/spork-rails.git
|
remote: git://github.com/sporkrb/spork-rails.git
|
||||||
revision: 3224f84d8c31fcb0894e9a43f6c3ac67e3aa0d71
|
revision: 3224f84d8c31fcb0894e9a43f6c3ac67e3aa0d71
|
||||||
|
@ -121,34 +163,11 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.0)
|
|
||||||
actionpack (= 4.0.0)
|
|
||||||
mail (~> 2.5.3)
|
|
||||||
actionpack (4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
builder (~> 3.1.0)
|
|
||||||
erubis (~> 2.7.0)
|
|
||||||
rack (~> 1.5.2)
|
|
||||||
rack-test (~> 0.6.2)
|
|
||||||
actionpack-action_caching (1.0.0)
|
actionpack-action_caching (1.0.0)
|
||||||
actionpack (>= 4.0.0.beta, < 5.0)
|
actionpack (>= 4.0.0.beta, < 5.0)
|
||||||
active_model_serializers (0.8.1)
|
active_model_serializers (0.8.1)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
activemodel (4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
builder (~> 3.1.0)
|
|
||||||
activerecord (4.0.0)
|
|
||||||
activemodel (= 4.0.0)
|
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
arel (~> 4.0.0)
|
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
activesupport (4.0.0)
|
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
|
||||||
minitest (~> 4.2)
|
|
||||||
multi_json (~> 1.3)
|
|
||||||
thread_safe (~> 0.1)
|
|
||||||
tzinfo (~> 0.3.37)
|
|
||||||
addressable (2.3.5)
|
addressable (2.3.5)
|
||||||
airbrake (3.1.2)
|
airbrake (3.1.2)
|
||||||
activesupport
|
activesupport
|
||||||
|
@ -329,7 +348,7 @@ GEM
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-cors (0.2.8)
|
rack-cors (0.2.8)
|
||||||
rack
|
rack
|
||||||
rack-mini-profiler (0.1.27)
|
rack-mini-profiler (0.1.28)
|
||||||
rack (>= 1.1.3)
|
rack (>= 1.1.3)
|
||||||
rack-openid (1.3.1)
|
rack-openid (1.3.1)
|
||||||
rack (>= 1.1.0)
|
rack (>= 1.1.0)
|
||||||
|
@ -338,21 +357,8 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.0)
|
|
||||||
actionmailer (= 4.0.0)
|
|
||||||
actionpack (= 4.0.0)
|
|
||||||
activerecord (= 4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
bundler (>= 1.3.0, < 2.0)
|
|
||||||
railties (= 4.0.0)
|
|
||||||
sprockets-rails (~> 2.0.0)
|
|
||||||
rails-observers (0.1.2)
|
rails-observers (0.1.2)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
railties (4.0.0)
|
|
||||||
actionpack (= 4.0.0)
|
|
||||||
activesupport (= 4.0.0)
|
|
||||||
rake (>= 0.8.7)
|
|
||||||
thor (>= 0.18.1, < 2.0)
|
|
||||||
raindrops (0.11.0)
|
raindrops (0.11.0)
|
||||||
rake (10.1.0)
|
rake (10.1.0)
|
||||||
rake-compiler (0.8.3)
|
rake-compiler (0.8.3)
|
||||||
|
@ -446,7 +452,7 @@ GEM
|
||||||
eventmachine (>= 0.12.6)
|
eventmachine (>= 0.12.6)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.18.1)
|
thor (0.18.1)
|
||||||
thread_safe (0.1.0)
|
thread_safe (0.1.2)
|
||||||
atomic
|
atomic
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timecop (0.6.2.2)
|
timecop (0.6.2.2)
|
||||||
|
@ -525,8 +531,8 @@ DEPENDENCIES
|
||||||
qunit-rails
|
qunit-rails
|
||||||
rack-cache
|
rack-cache
|
||||||
rack-cors
|
rack-cors
|
||||||
rack-mini-profiler (= 0.1.27)
|
rack-mini-profiler (= 0.1.28)
|
||||||
rails (= 4.0.0)
|
rails!
|
||||||
rails-observers
|
rails-observers
|
||||||
rails_multisite!
|
rails_multisite!
|
||||||
rake
|
rake
|
||||||
|
|
Loading…
Reference in a new issue