Commit a8851a3c authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'fix-downtime-check-compare-with-branch' into 'master'

Always compare with FETCH_HEAD in downtime_check

See merge request !5619
parents 8e9b6019 ab0aedef
desc 'Checks if migrations in a branch require downtime' desc 'Checks if migrations in a branch require downtime'
task downtime_check: :environment do task downtime_check: :environment do
# First we'll want to make sure we're comparing with the right upstream
# repository/branch.
current_branch = `git rev-parse --abbrev-ref HEAD`.strip
# Either the developer ran this task directly on the master branch, or they're
# making changes directly on the master branch.
if current_branch == 'master'
if defined?(Gitlab::License) if defined?(Gitlab::License)
repo = 'gitlab-ee' repo = 'gitlab-ee'
else else
...@@ -15,12 +8,5 @@ task downtime_check: :environment do ...@@ -15,12 +8,5 @@ task downtime_check: :environment do
`git fetch https://gitlab.com/gitlab-org/#{repo}.git --depth 1` `git fetch https://gitlab.com/gitlab-org/#{repo}.git --depth 1`
compare_with = 'FETCH_HEAD' Rake::Task['gitlab:db:downtime_check'].invoke('FETCH_HEAD')
# The developer is working on a different branch, in this case we can just
# compare with the master branch.
else
compare_with = 'master'
end
Rake::Task['gitlab:db:downtime_check'].invoke(compare_with)
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment