diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-19 03:01:14 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-19 03:01:14 +0000 |
| commit | 2becc6fae9b82479b644c0ca10b758cf8447bc19 (patch) | |
| tree | 4cad073a1df07d8a9b5fe0e2920961eea1d69a56 /lib | |
| parent | 0782ca771ab4af9fdccb844d752d588bb61f6d9f (diff) | |
| parent | 96440042a904274b88afc25eddd46c2722482427 (diff) | |
| download | gitlab-ce-2becc6fae9b82479b644c0ca10b758cf8447bc19.tar.gz | |
Merge branch 'warning-pending-migrations' into 'master'
Raise an error on page load when there are pending migrations in
development mode.
Fixes #5990
See merge request !2491
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 |