diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-07 19:15:06 +0100 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-14 19:36:22 +0100 |
| commit | 44fef4fe4cb9d4f30f129ff5a548395bc924c8fe (patch) | |
| tree | ac5e97a16658edfb25b8407f1cf2d9a11c172667 /config/application.rb | |
| parent | eafc8e2f481751b973260287c844b70bd408dcb2 (diff) | |
| download | gitlab-ce-44fef4fe4cb9d4f30f129ff5a548395bc924c8fe.tar.gz | |
Remove rails 4 support in CI, Gemfiles, bin/ and config/
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/config/application.rb b/config/application.rb index f10b8ed5bd2..720196b945e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,7 +8,7 @@ module Gitlab # This method is used for smooth upgrading from the current Rails 4.x to Rails 5.0. # https://gitlab.com/gitlab-org/gitlab-ce/issues/14286 def self.rails5? - !%w[0 false].include?(ENV["RAILS5"]) + true end class Application < Rails::Application @@ -26,9 +26,6 @@ module Gitlab # setting disabled require_dependency Rails.root.join('lib/mysql_zero_date') - # This can be removed when we drop support for rails 4 - require_dependency Rails.root.join('lib/rails4_migration_version') - # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. @@ -86,7 +83,7 @@ module Gitlab # namespaces/users. # https://github.com/rails/rails/blob/5-0-stable/actioncable/lib/action_cable.rb#L38 # Please change this value when configuring ActionCable for real usage. - config.action_cable.mount_path = "/-/cable" if rails5? + config.action_cable.mount_path = "/-/cable" # Configure sensitive parameters which will be filtered from the log file. # @@ -213,8 +210,6 @@ module Gitlab config.cache_store = :redis_store, caching_config_hash - config.active_record.raise_in_transactional_callbacks = true unless rails5? - config.active_job.queue_adapter = :sidekiq # This is needed for gitlab-shell |