github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 03:29:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "DEV: upgrade Rails"

Browse Source 
This reverts commit 5b3bb4b2f0.

This erratically breaks multisite operation, we need more debugging
This commit is contained in:
Sam Saffron 2020-03-24 17:11:13 +11:00
parent 46a9622246
commit c7151f0fd6
No known key found for this signature in database
GPG Key ID: B9606168D2FFD9F5
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile
View File

@ -18,13 +18,13 @@ else
# this allows us to include the bits of rails we use without pieces we do not. # this allows us to include the bits of rails we use without pieces we do not.
# #
# To issue a rails update bump the version number here # To issue a rails update bump the version number here
gem 'actionmailer', '6.0.2.2' gem 'actionmailer', '6.0.1'
gem 'actionpack', '6.0.2.2' gem 'actionpack', '6.0.1'
gem 'actionview', '6.0.2.2' gem 'actionview', '6.0.1'
gem 'activemodel', '6.0.2.2' gem 'activemodel', '6.0.1'
gem 'activerecord', '6.0.2.2' gem 'activerecord', '6.0.1'
gem 'activesupport', '6.0.2.2' gem 'activesupport', '6.0.1'
gem 'railties', '6.0.2.2' gem 'railties', '6.0.1'
gem 'sprockets-rails' gem 'sprockets-rails'
end end

56
Gemfile.lock
View File

@ -1,21 +1,21 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (6.0.2.2) actionmailer (6.0.1)
actionpack (= 6.0.2.2) actionpack (= 6.0.1)
actionview (= 6.0.2.2) actionview (= 6.0.1)
activejob (= 6.0.2.2) activejob (= 6.0.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.2.2) actionpack (6.0.1)
actionview (= 6.0.2.2) actionview (= 6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.2.2) actionview (6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -24,15 +24,15 @@ GEM
actionview (>= 6.0.a) actionview (>= 6.0.a)
active_model_serializers (0.8.4) active_model_serializers (0.8.4)
activemodel (>= 3.0) activemodel (>= 3.0)
activejob (6.0.2.2) activejob (6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.2.2) activemodel (6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
activerecord (6.0.2.2) activerecord (6.0.1)
activemodel (= 6.0.2.2) activemodel (= 6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
activesupport (6.0.2.2) activesupport (6.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -283,9 +283,9 @@ GEM
rails_multisite (2.1.1) rails_multisite (2.1.1)
activerecord (> 5.0, < 7) activerecord (> 5.0, < 7)
railties (> 5.0, < 7) railties (> 5.0, < 7)
railties (6.0.2.2) railties (6.0.1)
actionpack (= 6.0.2.2) actionpack (= 6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
@ -423,14 +423,14 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
actionmailer (= 6.0.2.2) actionmailer (= 6.0.1)
actionpack (= 6.0.2.2) actionpack (= 6.0.1)
actionview (= 6.0.2.2) actionview (= 6.0.1)
actionview_precompiler actionview_precompiler
active_model_serializers (~> 0.8.3) active_model_serializers (~> 0.8.3)
activemodel (= 6.0.2.2) activemodel (= 6.0.1)
activerecord (= 6.0.2.2) activerecord (= 6.0.1)
activesupport (= 6.0.2.2) activesupport (= 6.0.1)
addressable addressable
annotate annotate
aws-sdk-s3 aws-sdk-s3
@ -510,7 +510,7 @@ DEPENDENCIES
rack-mini-profiler rack-mini-profiler
rack-protection rack-protection
rails_multisite rails_multisite
railties (= 6.0.2.2) railties (= 6.0.1)
rake rake
rb-fsevent rb-fsevent
rb-inotify (~> 0.9) rb-inotify (~> 0.9)