diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-14 16:12:37 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-14 16:12:37 +0300 |
| commit | 17335a42aea4c9ddccbe92527752ae0e6b9b7835 (patch) | |
| tree | 036eab1e7ca9a0d1533785f34263a2299ca7f2ef /app/models/project.rb | |
| parent | c4a3587c7700eb4731502223e4683360454ed0d4 (diff) | |
| parent | fa36101a7fc8679d98198942f15dd6285673594d (diff) | |
Merge branch 'rails5-database' into 'master'
Fix table_exists? to be Rails5 compatible
Closes #45107
See merge request gitlab-org/gitlab-ce!19418
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index f0d8c40bfea..e5fa1c4db7b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -68,7 +68,7 @@ class Project < ActiveRecord::Base add_authentication_token_field :runners_token - before_validation :mark_remote_mirrors_for_removal, if: -> { ActiveRecord::Base.connection.table_exists?(:remote_mirrors) } + before_validation :mark_remote_mirrors_for_removal, if: -> { RemoteMirror.table_exists? } before_save :ensure_runners_token |