IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

revert to rails 5.1 for now

Browse Source
This commit is contained in:
Sam
2018-06-07 19:47:53 +10:00
parent 74ced977be
commit d3b8ee761c
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile
View File

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

14
Gemfile.lock
View File

@@ -405,13 +405,13 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
actionmailer (~> 5.2) actionmailer (~> 5.1)
actionpack (~> 5.2) actionpack (~> 5.1)
actionview (~> 5.2) actionview (~> 5.1)
active_model_serializers (~> 0.8.3) active_model_serializers (~> 0.8.3)
activemodel (~> 5.2) activemodel (~> 5.1)
activerecord (~> 5.2) activerecord (~> 5.1)
activesupport (~> 5.2) activesupport (~> 5.1)
annotate annotate
aws-sdk-s3 aws-sdk-s3
barber barber
@@ -479,7 +479,7 @@ DEPENDENCIES
rack-mini-profiler rack-mini-profiler
rack-protection rack-protection
rails_multisite rails_multisite
railties (~> 5.2) railties (~> 5.1)
rake rake
rb-fsevent rb-fsevent
rb-inotify (~> 0.9) rb-inotify (~> 0.9)