deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

corrected exception for automerge

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-22 16:49:45 +03:00
parent 511d07c47c
commit 204c66461e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab_merge.rb
View file

@ -30,7 +30,7 @@ class GitlabMerge
f.flock(File::LOCK_EX) f.flock(File::LOCK_EX)
unless project.satellite.exists? unless project.satellite.exists?
raise "You should run: rake gitlab_enable_automerge" raise "You should run: rake gitlab:app:enable_automerge"
end end
project.satellite.clear project.satellite.clear