Rename gitlab:app:enable_automerge to gitlab:enable_automerge

Riyad Preukschas
1 parent e3a7e43f
Showing 4 changed files with 12 additions and 14 deletions Show diff stats
doc/raketasks/features.md
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/enable_automerge.rake
lib/tasks/gitlab/setup.rake
@@ -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:
@@ -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 "
 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
@@ -4,7 +4,7 @@ namespace :gitlab do
     task :setup => [
       'db:setup',
       'db:seed_fu',
-      'gitlab:app:enable_automerge'
+      'gitlab:enable_automerge'
     ]
   end
 end
...	...	@@ -22,7 +22,7 @@ bundle exec rake gitlab:enable_namespaces
22	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	28	Example output:
...	...
...	...	@@ -192,7 +192,7 @@ namespace :gitlab do
192	192	else
193	193	puts "no".red
194	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	197	for_more_information(
198	198	"doc/raketasks/maintenance.md "
...	...
1	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	10	end
13		-
14		- puts "Done!".green
15	11	end
	12	+
	13	+ puts "Done!".green
16	14	end
17	15	end
...	...
...	...	@@ -4,7 +4,7 @@ namespace :gitlab do
4	4	task :setup => [
5	5	'db:setup',
6	6	'db:seed_fu',
7		- 'gitlab:app:enable_automerge'
	7	+ 'gitlab:enable_automerge'
8	8	]
9	9	end
10	10	end
...	...