mirror of
https://github.com/discourse/discourse.git
synced 2024-11-29 11:44:44 +08:00
Prepare for Rails 5, don't simply include Rails be explicit
This commit is contained in:
parent
460675400f
commit
950b69cfb0
11
Gemfile
11
Gemfile
|
@ -12,9 +12,18 @@ if rails_master?
|
||||||
gem 'rails-observers', git: 'https://github.com/rails/rails-observers.git'
|
gem 'rails-observers', git: 'https://github.com/rails/rails-observers.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 'rails', '~> 4.2'
|
# Rails 5 is going to ship with Action Cable, we have no use for it as
|
||||||
|
# we already ship MessageBus, AC introduces dependencies on Event Machine,
|
||||||
|
# Celluloid and Faye Web Sockets.
|
||||||
|
gem 'activesupport', '~> 4.2'
|
||||||
|
gem 'actionpack'
|
||||||
|
gem 'activerecord'
|
||||||
|
gem 'actionmailer'
|
||||||
|
gem 'activejob'
|
||||||
|
gem 'railties'
|
||||||
gem 'rails-observers'
|
gem 'rails-observers'
|
||||||
gem 'seed-fu', '~> 2.3.5'
|
gem 'seed-fu', '~> 2.3.5'
|
||||||
|
gem 'sprockets-rails'
|
||||||
end
|
end
|
||||||
|
|
||||||
gem 'mail'
|
gem 'mail'
|
||||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -199,8 +199,8 @@ GEM
|
||||||
metaclass (0.0.4)
|
metaclass (0.0.4)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.6.2)
|
mime-types (2.6.2)
|
||||||
mini_portile (0.6.2)
|
mini_portile2 (2.0.0)
|
||||||
minitest (5.8.0)
|
minitest (5.8.3)
|
||||||
mocha (1.1.0)
|
mocha (1.1.0)
|
||||||
metaclass (~> 0.0.1)
|
metaclass (~> 0.0.1)
|
||||||
mock_redis (0.15.2)
|
mock_redis (0.15.2)
|
||||||
|
@ -212,8 +212,8 @@ GEM
|
||||||
mustache (1.0.2)
|
mustache (1.0.2)
|
||||||
nenv (0.2.0)
|
nenv (0.2.0)
|
||||||
netrc (0.10.3)
|
netrc (0.10.3)
|
||||||
nokogiri (1.6.6.4)
|
nokogiri (1.6.7.1)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
nokogumbo (1.4.1)
|
nokogumbo (1.4.1)
|
||||||
nokogiri
|
nokogiri
|
||||||
oauth (0.4.7)
|
oauth (0.4.7)
|
||||||
|
@ -441,7 +441,12 @@ PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
|
actionmailer
|
||||||
|
actionpack
|
||||||
active_model_serializers (~> 0.8.3)
|
active_model_serializers (~> 0.8.3)
|
||||||
|
activejob
|
||||||
|
activerecord
|
||||||
|
activesupport (~> 4.2)
|
||||||
annotate
|
annotate
|
||||||
aws-sdk
|
aws-sdk
|
||||||
babel-transpiler
|
babel-transpiler
|
||||||
|
@ -499,9 +504,9 @@ DEPENDENCIES
|
||||||
r2 (~> 0.2.5)
|
r2 (~> 0.2.5)
|
||||||
rack-mini-profiler
|
rack-mini-profiler
|
||||||
rack-protection
|
rack-protection
|
||||||
rails (~> 4.2)
|
|
||||||
rails-observers
|
rails-observers
|
||||||
rails_multisite
|
rails_multisite
|
||||||
|
railties
|
||||||
rake
|
rake
|
||||||
rb-fsevent
|
rb-fsevent
|
||||||
rb-inotify (~> 0.9)
|
rb-inotify (~> 0.9)
|
||||||
|
@ -527,6 +532,7 @@ DEPENDENCIES
|
||||||
simplecov
|
simplecov
|
||||||
sinatra
|
sinatra
|
||||||
spork-rails
|
spork-rails
|
||||||
|
sprockets-rails
|
||||||
stackprof
|
stackprof
|
||||||
therubyracer
|
therubyracer
|
||||||
thin
|
thin
|
||||||
|
|
Loading…
Reference in New Issue
Block a user