diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-17 11:02:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-17 11:02:17 +0000 |
| commit | 32b6129d8cef406b1cafa455fcf0bf83ddba46de (patch) | |
| tree | c3b11f9f7aec8ced342a5d5868bb203dfe12569b /config | |
| parent | 9072516f8a5b4298175dbea4d62fcf6203297337 (diff) | |
| parent | 56296f1edadf2bc5f7741cbb3f97cb41f090aac6 (diff) | |
| download | gitlab-ce-32b6129d8cef406b1cafa455fcf0bf83ddba46de.tar.gz | |
Merge branch 'remove-rails4-specific-code' into 'master'
Remove rails4 specific code
See merge request gitlab-org/gitlab-ce!23847
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb index 720196b945e..349c7258852 100644 --- a/config/application.rb +++ b/config/application.rb @@ -5,12 +5,6 @@ require 'rails/all' Bundler.require(:default, Rails.env) 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? - true - end - class Application < Rails::Application require_dependency Rails.root.join('lib/gitlab/redis/wrapper') require_dependency Rails.root.join('lib/gitlab/redis/cache') |