kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Always compare with FETCH_HEAD in downtime_check

See merge request !5619
This commit is contained in:
Yorick Peterse 2016-08-02 10:36:30 +00:00
commit a8851a3c9f
1 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/tasks/downtime_check.rake
View file

@ -1,12 +1,5 @@
desc 'Checks if migrations in a branch require downtime'
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)
repo = 'gitlab-ee'
else
@ -15,12 +8,5 @@ task downtime_check: :environment do
`git fetch https://gitlab.com/gitlab-org/#{repo}.git --depth 1`
compare_with = '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)
Rake::Task['gitlab:db:downtime_check'].invoke('FETCH_HEAD')
end