mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 17:06:31 -06:00
revert to rails 5.1 for now
This commit is contained in:
parent
74ced977be
commit
d3b8ee761c
14
Gemfile
14
Gemfile
@ -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.2'
|
||||
gem 'actionpack', '~> 5.2'
|
||||
gem 'actionview', '~> 5.2'
|
||||
gem 'activemodel', '~> 5.2'
|
||||
gem 'activerecord', '~> 5.2'
|
||||
gem 'activesupport', '~> 5.2'
|
||||
gem 'railties', '~> 5.2'
|
||||
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 'sprockets-rails'
|
||||
gem 'seed-fu'
|
||||
end
|
||||
|
14
Gemfile.lock
14
Gemfile.lock
@ -405,13 +405,13 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
actionmailer (~> 5.2)
|
||||
actionpack (~> 5.2)
|
||||
actionview (~> 5.2)
|
||||
actionmailer (~> 5.1)
|
||||
actionpack (~> 5.1)
|
||||
actionview (~> 5.1)
|
||||
active_model_serializers (~> 0.8.3)
|
||||
activemodel (~> 5.2)
|
||||
activerecord (~> 5.2)
|
||||
activesupport (~> 5.2)
|
||||
activemodel (~> 5.1)
|
||||
activerecord (~> 5.1)
|
||||
activesupport (~> 5.1)
|
||||
annotate
|
||||
aws-sdk-s3
|
||||
barber
|
||||
@ -479,7 +479,7 @@ DEPENDENCIES
|
||||
rack-mini-profiler
|
||||
rack-protection
|
||||
rails_multisite
|
||||
railties (~> 5.2)
|
||||
railties (~> 5.1)
|
||||
rake
|
||||
rb-fsevent
|
||||
rb-inotify (~> 0.9)
|
||||
|
Loading…
Reference in New Issue
Block a user