Commit 501f048846bad9a66583bb73d448564eca752905
1 parent
e3a7e43f
Exists in
master
and in
4 other branches
Rename gitlab:app:enable_automerge to gitlab:enable_automerge
Showing
4 changed files
with
12 additions
and
14 deletions
Show diff stats
doc/raketasks/features.md
@@ -22,7 +22,7 @@ bundle exec rake gitlab:enable_namespaces | @@ -22,7 +22,7 @@ bundle exec rake gitlab:enable_namespaces | ||
22 | 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**. | 22 | 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**. |
23 | 23 | ||
24 | ``` | 24 | ``` |
25 | -bundle exec rake gitlab:app:enable_automerge | 25 | +bundle exec rake gitlab:enable_automerge |
26 | ``` | 26 | ``` |
27 | 27 | ||
28 | Example output: | 28 | Example output: |
lib/tasks/gitlab/check.rake
@@ -192,7 +192,7 @@ namespace :gitlab do | @@ -192,7 +192,7 @@ namespace :gitlab do | ||
192 | else | 192 | else |
193 | puts "no".red | 193 | puts "no".red |
194 | try_fixing_it( | 194 | try_fixing_it( |
195 | - "sudo -u gitlab -H bundle exec rake gitlab:app:enable_automerge" | 195 | + "sudo -u gitlab -H bundle exec rake gitlab:enable_automerge" |
196 | ) | 196 | ) |
197 | for_more_information( | 197 | for_more_information( |
198 | "doc/raketasks/maintenance.md " | 198 | "doc/raketasks/maintenance.md " |
lib/tasks/gitlab/enable_automerge.rake
1 | namespace :gitlab do | 1 | namespace :gitlab do |
2 | - namespace :app do | ||
3 | - desc "GITLAB | Enable auto merge" | ||
4 | - task :enable_automerge => :environment do | ||
5 | - Gitlab::Gitolite.new.enable_automerge | 2 | + desc "GITLAB | Enable auto merge" |
3 | + task :enable_automerge => :environment do | ||
4 | + Gitlab::Gitolite.new.enable_automerge | ||
6 | 5 | ||
7 | - Project.find_each do |project| | ||
8 | - if project.repo_exists? && !project.satellite.exists? | ||
9 | - puts "Creating satellite for #{project.name}...".green | ||
10 | - project.satellite.create | ||
11 | - end | 6 | + Project.find_each do |project| |
7 | + if project.repo_exists? && !project.satellite.exists? | ||
8 | + puts "Creating satellite for #{project.name}...".green | ||
9 | + project.satellite.create | ||
12 | end | 10 | end |
13 | - | ||
14 | - puts "Done!".green | ||
15 | end | 11 | end |
12 | + | ||
13 | + puts "Done!".green | ||
16 | end | 14 | end |
17 | end | 15 | end |
lib/tasks/gitlab/setup.rake