diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-19 11:18:57 +0100 |
| commit | b4d61ac46babc04f67bb191c477dddc88e10ad45 (patch) | |
| tree | 5c956996de67438678ba59d5e02e3627713b2e2f /lib | |
| parent | 1ede975cde6d32a74b2d4d523e5c0e242c89d50d (diff) | |
| parent | 2becc6fae9b82479b644c0ca10b758cf8447bc19 (diff) | |
| download | gitlab-ce-doc_refactor_commits_api.tar.gz | |
Merge branch 'master' into doc_refactor_commits_apidoc_refactor_commits_api
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 7f938780ab1..ea054255820 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -39,7 +39,6 @@ module Gitlab end use_db && ActiveRecord::Base.connection.active? && - !ActiveRecord::Migrator.needs_migration? && ActiveRecord::Base.connection.table_exists?('application_settings') rescue ActiveRecord::NoDatabaseError |