diff options
author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-20 19:38:44 +0100 |
---|---|---|
committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-12-20 20:22:25 +0100 |
commit | 501f048846bad9a66583bb73d448564eca752905 (patch) | |
tree | a3a8a8b4f60d77a63112c66a0bdf7961fb48c9be | |
parent | e3a7e43ff4fb1ebf9e594b32abcb980a8b905c49 (diff) | |
download | gitlab-ce-501f048846bad9a66583bb73d448564eca752905.tar.gz |
Rename gitlab:app:enable_automerge to gitlab:enable_automerge
-rw-r--r-- | doc/raketasks/features.md | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/check.rake | 2 | ||||
-rw-r--r-- | lib/tasks/gitlab/enable_automerge.rake | 20 | ||||
-rw-r--r-- | lib/tasks/gitlab/setup.rake | 2 |
4 files changed, 12 insertions, 14 deletions
diff --git a/doc/raketasks/features.md b/doc/raketasks/features.md index 9dc6a4ef5eb..7a2a4b668bd 100644 --- a/doc/raketasks/features.md +++ b/doc/raketasks/features.md @@ -22,7 +22,7 @@ bundle exec rake gitlab:enable_namespaces This command will enable the auto merge feature. After this you will be able to **merge a merge request** via GitLab and use the **online editor**. ``` -bundle exec rake gitlab:app:enable_automerge +bundle exec rake gitlab:enable_automerge ``` Example output: diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index d1f814080b5..20d65e6e0d0 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -192,7 +192,7 @@ namespace :gitlab do else puts "no".red try_fixing_it( - "sudo -u gitlab -H bundle exec rake gitlab:app:enable_automerge" + "sudo -u gitlab -H bundle exec rake gitlab:enable_automerge" ) for_more_information( "doc/raketasks/maintenance.md " diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake index 13b4bab6edc..a543a8a7385 100644 --- a/lib/tasks/gitlab/enable_automerge.rake +++ b/lib/tasks/gitlab/enable_automerge.rake @@ -1,17 +1,15 @@ namespace :gitlab do - namespace :app do - desc "GITLAB | Enable auto merge" - task :enable_automerge => :environment do - Gitlab::Gitolite.new.enable_automerge + desc "GITLAB | Enable auto merge" + task :enable_automerge => :environment do + Gitlab::Gitolite.new.enable_automerge - Project.find_each do |project| - if project.repo_exists? && !project.satellite.exists? - puts "Creating satellite for #{project.name}...".green - project.satellite.create - end + Project.find_each do |project| + if project.repo_exists? && !project.satellite.exists? + puts "Creating satellite for #{project.name}...".green + project.satellite.create end - - puts "Done!".green end + + puts "Done!".green end end diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index 08f35c7e3f0..572a22aa1f6 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -4,7 +4,7 @@ namespace :gitlab do task :setup => [ 'db:setup', 'db:seed_fu', - 'gitlab:app:enable_automerge' + 'gitlab:enable_automerge' ] end end |