downgrade rails properly

This commit is contained in:
Sam 2018-06-07 20:38:22 +10:00
parent 799081e846
commit 1834417e2f
3 changed files with 42 additions and 38 deletions

14
Gemfile
View File

@ -13,13 +13,13 @@ if rails_master?
gem 'rails', git: 'https://github.com/rails/rails.git'
gem 'seed-fu', git: 'https://github.com/SamSaffron/seed-fu.git', branch: 'discourse'
else
gem 'actionmailer', '~> 5.1'
gem 'actionpack', '~> 5.1'
gem 'actionview', '~> 5.1'
gem 'activemodel', '~> 5.1'
gem 'activerecord', '~> 5.1'
gem 'activesupport', '~> 5.1'
gem 'railties', '~> 5.1'
gem 'actionmailer', '5.1.5'
gem 'actionpack', '5.1.5'
gem 'actionview', '5.1.5'
gem 'activemodel', '5.1.5'
gem 'activerecord', '5.1.5'
gem 'activesupport', '5.1.5'
gem 'railties', '5.1.5'
gem 'sprockets-rails'
gem 'seed-fu'
end

View File

@ -1,39 +1,39 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (5.2.0)
actionpack (= 5.2.0)
actionview (= 5.2.0)
activejob (= 5.2.0)
actionmailer (5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.0)
actionview (= 5.2.0)
activesupport (= 5.2.0)
actionpack (5.1.5)
actionview (= 5.1.5)
activesupport (= 5.1.5)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.0)
activesupport (= 5.2.0)
actionview (5.1.5)
activesupport (= 5.1.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.8.4)
activemodel (>= 3.0)
activejob (5.2.0)
activesupport (= 5.2.0)
activejob (5.1.5)
activesupport (= 5.1.5)
globalid (>= 0.3.6)
activemodel (5.2.0)
activesupport (= 5.2.0)
activerecord (5.2.0)
activemodel (= 5.2.0)
activesupport (= 5.2.0)
arel (>= 9.0)
activesupport (5.2.0)
activemodel (5.1.5)
activesupport (= 5.1.5)
activerecord (5.1.5)
activemodel (= 5.1.5)
activesupport (= 5.1.5)
arel (~> 8.0)
activesupport (5.1.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
@ -41,7 +41,7 @@ GEM
annotate (2.7.4)
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0)
arel (9.0.0)
arel (8.0.0)
ast (2.4.0)
aws-eventstream (1.0.0)
aws-partitions (1.91.0)
@ -135,7 +135,7 @@ GEM
hkdf (0.3.0)
htmlentities (4.3.4)
http_accept_language (2.0.5)
i18n (1.0.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
image_size (1.5.0)
in_threads (1.5.0)
@ -272,9 +272,9 @@ GEM
rails_multisite (2.0.4)
activerecord (> 4.2, < 6)
railties (> 4.2, < 6)
railties (5.2.0)
actionpack (= 5.2.0)
activesupport (= 5.2.0)
railties (5.1.5)
actionpack (= 5.1.5)
activesupport (= 5.1.5)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@ -405,13 +405,13 @@ PLATFORMS
ruby
DEPENDENCIES
actionmailer (~> 5.1)
actionpack (~> 5.1)
actionview (~> 5.1)
actionmailer (= 5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
active_model_serializers (~> 0.8.3)
activemodel (~> 5.1)
activerecord (~> 5.1)
activesupport (~> 5.1)
activemodel (= 5.1.5)
activerecord (= 5.1.5)
activesupport (= 5.1.5)
annotate
aws-sdk-s3
barber
@ -479,7 +479,7 @@ DEPENDENCIES
rack-mini-profiler
rack-protection
rails_multisite
railties (~> 5.1)
railties (= 5.1.5)
rake
rb-fsevent
rb-inotify (~> 0.9)

View File

@ -1,6 +1,10 @@
# Speeds up #pluck so its about 2.2x faster, importantly makes pluck avoid creation of a slew
# of AR objects
#
#
# until we upgrade rails
return
require_dependency 'sql_builder'