projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17528-install-warnings'
[arvados.git]
/
services
/
api
/
config
/
application.rb
diff --git
a/services/api/config/application.rb
b/services/api/config/application.rb
index b6174a0d8989f36e2e851431b18fe1627a33dbb8..b28ae0e0718e2ddabc472f61be8cf8c07a53232f 100644
(file)
--- a/
services/api/config/application.rb
+++ b/
services/api/config/application.rb
@@
-2,7
+2,7
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
-require
File.expand_path('../boot', __FILE__)
+require
_relative 'boot'
require "rails"
# Pick only the frameworks we need:
require "rails"
# Pick only the frameworks we need:
@@
-12,10
+12,11
@@
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
-# Skip ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
-# require "action_cable/engine"
require "sprockets/railtie"
require "rails/test_unit/railtie"
require "sprockets/railtie"
require "rails/test_unit/railtie"
+# Skipping the following:
+# * ActionCable (new in Rails 5.0) as it adds '/cable' routes that we're not using
+# * ActiveStorage (new in Rails 5.1)
require 'digest'
require 'digest'