github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

upgrade to rails master

Browse Source
This commit is contained in:
Sam 2014-12-01 15:34:50 +11:00
parent 003d32babe
commit 9defb6879b
3 changed files with 92 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Gemfile
View File

@ -67,17 +67,19 @@ unless Bundler::Dependency::PLATFORM_MAP.include? :mri_21
end
end
gem 'seed-fu', '~> 2.3.3'
if rails_master?
gem 'arel', git: 'https://github.com/rails/arel.git'
gem 'rails', git: 'https://github.com/rails/rails.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'
else
gem 'seed-fu', '~> 2.3.3'
gem 'rails'
gem 'rails-observers'
end
gem 'actionpack-action_caching'
gem 'rails-observers'
# Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`.
# However, mail gem 2.6.x currently does not work with discourse because of the
@ -144,8 +146,15 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
gem 'omniauth-oauth2', require: false
gem 'omniauth-google-oauth2'
gem 'oj'
# while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
gem 'pg', '0.15.1'
if rails_master?
# native casting
gem 'pg', '0.18.0.pre20141117110243'
else
# while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
gem 'pg', '0.15.1'
end
gem 'pry-rails', require: false
gem 'rake'

4
Gemfile.lock
View File

@ -99,7 +99,7 @@ GEM
fastimage (1.6.3)
addressable (~> 2.3, >= 2.3.5)
ffi (1.9.5)
flamegraph (0.0.8)
flamegraph (0.0.9)
fast_stack
fog (1.22.1)
fog-brightbox
@ -273,7 +273,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rake (10.4.0)
rake-compiler (0.9.3)
rake
rb-fsevent (0.9.4)

144
Gemfile_master.lock
View File

@ -7,66 +7,26 @@ GIT
activemodel (>= 3.0)
GIT
remote: https://github.com/rails/arel.git
revision: 1fefe71b1872c0a83f09231164863cd8dbb57174
remote: https://github.com/SamSaffron/rails-observers.git
revision: 7d2222d758603a004f6599f82a7068ffeb2d7ebf
specs:
arel (6.0.0)
rails-observers (0.1.2)
activemodel (> 4.0)
GIT
remote: https://github.com/rails/rails.git
revision: 2f8be7ebafcf7815f9f3ec7983789157525a60fa
remote: https://github.com/SamSaffron/seed-fu.git
revision: d93df3b6364ea938d87c5629bf950b0d1ffe037e
branch: discourse
specs:
actionmailer (4.2.0.beta4)
actionpack (= 4.2.0.beta4)
actionview (= 4.2.0.beta4)
activejob (= 4.2.0.beta4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0.beta4)
actionview (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
rack (~> 1.6.0.beta)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
globalid (>= 0.3.0)
activemodel (4.2.0.beta4)
activesupport (= 4.2.0.beta4)
builder (~> 3.1)
activerecord (4.2.0.beta4)
activemodel (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
arel (~> 6.0)
activesupport (4.2.0.beta4)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
rails (4.2.0.beta4)
actionmailer (= 4.2.0.beta4)
actionpack (= 4.2.0.beta4)
actionview (= 4.2.0.beta4)
activejob (= 4.2.0.beta4)
activemodel (= 4.2.0.beta4)
activerecord (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0.beta4)
sprockets-rails (~> 3.0.0.beta1)
railties (4.2.0.beta4)
actionpack (= 4.2.0.beta4)
activesupport (= 4.2.0.beta4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
seed-fu (2.3.3)
activerecord (>= 3.1)
activesupport (>= 3.1)
GIT
remote: https://github.com/rails/arel.git
revision: 98fc25991137ee09b6800578117f8c1c322680f2
specs:
arel (6.0.0)
GIT
remote: https://github.com/rails/sass-rails.git
@ -78,6 +38,61 @@ GIT
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)
PATH
remote: ../rails
specs:
actionmailer (5.0.0.alpha)
actionpack (= 5.0.0.alpha)
actionview (= 5.0.0.alpha)
activejob (= 5.0.0.alpha)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (5.0.0.alpha)
actionview (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
rack (~> 1.6.0.beta2)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
globalid (>= 0.3.0)
activemodel (5.0.0.alpha)
activesupport (= 5.0.0.alpha)
builder (~> 3.1)
activerecord (5.0.0.alpha)
activemodel (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
arel (~> 6.0)
activesupport (5.0.0.alpha)
i18n (>= 0.7.0.beta1, < 0.8)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
rails (5.0.0.alpha)
actionmailer (= 5.0.0.alpha)
actionpack (= 5.0.0.alpha)
actionview (= 5.0.0.alpha)
activejob (= 5.0.0.alpha)
activemodel (= 5.0.0.alpha)
activerecord (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.0.alpha)
sprockets-rails
railties (5.0.0.alpha)
actionpack (= 5.0.0.alpha)
activesupport (= 5.0.0.alpha)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
PATH
remote: vendor/gems/rails_multisite
specs:
@ -150,7 +165,7 @@ GEM
fastimage (1.6.3)
addressable (~> 2.3, >= 2.3.5)
ffi (1.9.5)
flamegraph (0.0.8)
flamegraph (0.0.9)
fast_stack
fog (1.22.1)
fog-brightbox
@ -285,7 +300,7 @@ GEM
openid-redis-store (0.0.2)
redis
ruby-openid
pg (0.15.1)
pg (0.18.0.pre20141117110243)
polyglot (0.3.5)
progress (3.0.1)
pry (0.10.1)
@ -300,7 +315,7 @@ GEM
rack (>= 1.1, < 2.0)
qunit-rails (0.0.7)
railties
rack (1.6.0.beta)
rack (1.6.0.beta2)
rack-mini-profiler (0.9.2)
rack (>= 1.1.3)
rack-openid (1.3.1)
@ -318,8 +333,6 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
loofah (~> 2.0)
rails-observers (0.1.2)
activemodel (~> 4.0)
raindrops (0.13.0)
rake (10.4.0)
rake-compiler (0.9.3)
@ -373,9 +386,6 @@ GEM
nokogiri (>= 1.4.4)
nokogumbo (= 1.1.12)
sass (3.2.19)
seed-fu (2.3.3)
activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
@ -498,7 +508,7 @@ DEPENDENCIES
omniauth-twitter
onebox
openid-redis-store
pg (= 0.15.1)
pg (= 0.18.0.pre20141117110243)
pry-nav
pry-rails
puma
@ -506,7 +516,7 @@ DEPENDENCIES
rack-mini-profiler
rack-protection
rails!
rails-observers
rails-observers!
rails_multisite!
rake
rb-fsevent
@ -525,7 +535,7 @@ DEPENDENCIES
sanitize
sass
sass-rails!
seed-fu (~> 2.3.3)
seed-fu!
shoulda
sidekiq
simple-rss