diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-22 16:49:45 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-22 16:49:45 +0300 |
| commit | 204c66461ed519eb0078be7e8ac8a6cb56834753 (patch) | |
| tree | 9416c777cccf87d348f5705078e82f3f97485e19 | |
| parent | 511d07c47c9bf3a18bfa276d452c899369432a22 (diff) | |
| download | gitlab-ce-204c66461ed519eb0078be7e8ac8a6cb56834753.tar.gz | |
corrected exception for automergev2.4.0
| -rw-r--r-- | lib/gitlab_merge.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_merge.rb b/lib/gitlab_merge.rb index 98772bf0a24..078f77e12de 100644 --- a/lib/gitlab_merge.rb +++ b/lib/gitlab_merge.rb @@ -30,7 +30,7 @@ class GitlabMerge f.flock(File::LOCK_EX) unless project.satellite.exists? - raise "You should run: rake gitlab_enable_automerge" + raise "You should run: rake gitlab:app:enable_automerge" end project.satellite.clear |