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

rails 4 to use github branch so we get all fixes (in particular order fixes)

This commit is contained in:
Sam 2013-08-02 09:47:12 +10:00
parent b31f26ba01
commit 75345c1f8f
2 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -33,7 +33,7 @@ if rails4?
end
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 'rails-observers'
gem 'actionpack-action_caching'

86
Gemfile_rails4.lock
View File

@ -31,6 +31,48 @@ GIT
specs:
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
remote: git://github.com/sporkrb/spork-rails.git
revision: 3224f84d8c31fcb0894e9a43f6c3ac67e3aa0d71
@ -121,34 +163,11 @@ PATH
GEM
remote: https://rubygems.org/
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 (>= 4.0.0.beta, < 5.0)
active_model_serializers (0.8.1)
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)
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)
airbrake (3.1.2)
activesupport
@ -329,7 +348,7 @@ GEM
rack (>= 0.4)
rack-cors (0.2.8)
rack
rack-mini-profiler (0.1.27)
rack-mini-profiler (0.1.28)
rack (>= 1.1.3)
rack-openid (1.3.1)
rack (>= 1.1.0)
@ -338,21 +357,8 @@ GEM
rack
rack-test (0.6.2)
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)
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)
rake (10.1.0)
rake-compiler (0.8.3)
@ -446,7 +452,7 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.0)
thread_safe (0.1.2)
atomic
tilt (1.4.1)
timecop (0.6.2.2)
@ -525,8 +531,8 @@ DEPENDENCIES
qunit-rails
rack-cache
rack-cors
rack-mini-profiler (= 0.1.27)
rails (= 4.0.0)
rack-mini-profiler (= 0.1.28)
rails!
rails-observers
rails_multisite!
rake