Rename gitlab:app:enable_automerge to gitlab:enable_automerge

This commit is contained in:
Riyad Preukschas 2012-12-20 19:38:44 +01:00
parent e3a7e43ff4
commit 501f048846
4 changed files with 12 additions and 14 deletions

View file

@ -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**. 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: Example output:

View file

@ -192,7 +192,7 @@ namespace :gitlab do
else else
puts "no".red puts "no".red
try_fixing_it( 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( for_more_information(
"doc/raketasks/maintenance.md " "doc/raketasks/maintenance.md "

View file

@ -1,5 +1,4 @@
namespace :gitlab do namespace :gitlab do
namespace :app do
desc "GITLAB | Enable auto merge" desc "GITLAB | Enable auto merge"
task :enable_automerge => :environment do task :enable_automerge => :environment do
Gitlab::Gitolite.new.enable_automerge Gitlab::Gitolite.new.enable_automerge
@ -13,5 +12,4 @@ namespace :gitlab do
puts "Done!".green puts "Done!".green
end end
end
end end

View file

@ -4,7 +4,7 @@ namespace :gitlab do
task :setup => [ task :setup => [
'db:setup', 'db:setup',
'db:seed_fu', 'db:seed_fu',
'gitlab:app:enable_automerge' 'gitlab:enable_automerge'
] ]
end end
end end