mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-12-11 16:21:24 -05:00
Rails 4 upgrade
This commit is contained in:
Sam
parent
31c575687b
commit
cec18aba3f
2 changed files with 42 additions and 41 deletions
77
Gemfile.lock
77
Gemfile.lock
|
|
@ -11,34 +11,36 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.5)
|
actionmailer (4.1.1)
|
||||||
actionpack (= 4.0.5)
|
actionpack (= 4.1.1)
|
||||||
|
actionview (= 4.1.1)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.0.5)
|
actionpack (4.1.1)
|
||||||
activesupport (= 4.0.5)
|
actionview (= 4.1.1)
|
||||||
builder (~> 3.1.0)
|
activesupport (= 4.1.1)
|
||||||
erubis (~> 2.7.0)
|
|
||||||
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.1)
|
||||||
|
activesupport (= 4.1.1)
|
||||||
|
builder (~> 3.1)
|
||||||
|
erubis (~> 2.7.0)
|
||||||
active_model_serializers (0.8.1)
|
active_model_serializers (0.8.1)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
activemodel (4.0.5)
|
activemodel (4.1.1)
|
||||||
activesupport (= 4.0.5)
|
activesupport (= 4.1.1)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1)
|
||||||
activerecord (4.0.5)
|
activerecord (4.1.1)
|
||||||
activemodel (= 4.0.5)
|
activemodel (= 4.1.1)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activesupport (= 4.1.1)
|
||||||
activesupport (= 4.0.5)
|
arel (~> 5.0.0)
|
||||||
arel (~> 4.0.0)
|
activesupport (4.1.1)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
|
||||||
activesupport (4.0.5)
|
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
minitest (~> 4.2)
|
json (~> 1.7, >= 1.7.7)
|
||||||
multi_json (~> 1.3)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 0.3.37)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.3.6)
|
addressable (2.3.6)
|
||||||
airbrake (3.1.2)
|
airbrake (3.1.2)
|
||||||
activesupport
|
activesupport
|
||||||
|
|
@ -46,7 +48,7 @@ GEM
|
||||||
annotate (2.6.1)
|
annotate (2.6.1)
|
||||||
activerecord (>= 2.3.0)
|
activerecord (>= 2.3.0)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
arel (4.0.2)
|
arel (5.0.1.20140414130214)
|
||||||
barber (0.4.2)
|
barber (0.4.2)
|
||||||
ember-source
|
ember-source
|
||||||
execjs
|
execjs
|
||||||
|
|
@ -56,7 +58,7 @@ GEM
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
builder (3.1.4)
|
builder (3.2.2)
|
||||||
celluloid (0.15.2)
|
celluloid (0.15.2)
|
||||||
timers (~> 1.1.0)
|
timers (~> 1.1.0)
|
||||||
certified (0.1.1)
|
certified (0.1.1)
|
||||||
|
|
@ -164,7 +166,7 @@ GEM
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.5.3)
|
mini_portile (0.5.3)
|
||||||
minitest (4.7.5)
|
minitest (5.3.3)
|
||||||
mocha (1.0.0)
|
mocha (1.0.0)
|
||||||
metaclass (~> 0.0.1)
|
metaclass (~> 0.0.1)
|
||||||
mock_redis (0.11.0)
|
mock_redis (0.11.0)
|
||||||
|
|
@ -244,19 +246,21 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.5)
|
rails (4.1.1)
|
||||||
actionmailer (= 4.0.5)
|
actionmailer (= 4.1.1)
|
||||||
actionpack (= 4.0.5)
|
actionpack (= 4.1.1)
|
||||||
activerecord (= 4.0.5)
|
actionview (= 4.1.1)
|
||||||
activesupport (= 4.0.5)
|
activemodel (= 4.1.1)
|
||||||
|
activerecord (= 4.1.1)
|
||||||
|
activesupport (= 4.1.1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.5)
|
railties (= 4.1.1)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0)
|
||||||
rails-observers (0.1.2)
|
rails-observers (0.1.2)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
railties (4.0.5)
|
railties (4.1.1)
|
||||||
actionpack (= 4.0.5)
|
actionpack (= 4.1.1)
|
||||||
activesupport (= 4.0.5)
|
activesupport (= 4.1.1)
|
||||||
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)
|
||||||
|
|
@ -310,9 +314,9 @@ GEM
|
||||||
sass (~> 3.2.0)
|
sass (~> 3.2.0)
|
||||||
sprockets (~> 2.8, <= 2.11.0)
|
sprockets (~> 2.8, <= 2.11.0)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
seed-fu-discourse (2.2.0)
|
seed-fu-discourse (2.2.1)
|
||||||
activerecord (>= 3.1, < 4.1)
|
activerecord (>= 3.1, < 4.2)
|
||||||
activesupport (>= 3.1, < 4.1)
|
activesupport (>= 3.1, < 4.2)
|
||||||
shoulda (3.5.0)
|
shoulda (3.5.0)
|
||||||
shoulda-context (~> 1.0, >= 1.0.1)
|
shoulda-context (~> 1.0, >= 1.0.1)
|
||||||
shoulda-matchers (>= 1.4.1, < 3.0)
|
shoulda-matchers (>= 1.4.1, < 3.0)
|
||||||
|
|
@ -371,7 +375,8 @@ GEM
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
trollop (2.0)
|
trollop (2.0)
|
||||||
tzinfo (0.3.39)
|
tzinfo (1.1.0)
|
||||||
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.4.0)
|
uglifier (2.4.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,7 @@ module Trashable
|
||||||
#
|
#
|
||||||
# with this in place Post.limit(10).with_deleted, will work as expected
|
# with this in place Post.limit(10).with_deleted, will work as expected
|
||||||
#
|
#
|
||||||
scope = if rails_master?
|
scope = self.all
|
||||||
self.all
|
|
||||||
else
|
|
||||||
self.all.with_default_scope
|
|
||||||
end
|
|
||||||
|
|
||||||
scope.where_values.delete(with_deleted_scope_sql)
|
scope.where_values.delete(with_deleted_scope_sql)
|
||||||
scope
|
scope
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue