Rename gitlab:app:setup task to gitlab:setup

Riyad Preukschas
1 parent b7457f39
Showing 2 changed files with 17 additions and 19 deletions Show diff stats
doc/install/installation.md
lib/tasks/gitlab/setup.rake
@@ -260,7 +260,7 @@ used for the `email.from` setting in `config/gitlab.yml`)
  
 ## Initialise Database and Activate Advanced Features
  
-    sudo -u gitlab -H bundle exec rake gitlab:app:setup RAILS_ENV=production
+    sudo -u gitlab -H bundle exec rake gitlab:setup RAILS_ENV=production
  
  
 ## Install Init Script
 namespace :gitlab do
-  namespace :app do
-    desc "GITLAB | Setup production application"
-    task :setup => :environment do
-      setup
-    end
+  desc "GITLAB | Setup production application"
+  task :setup => :environment do
+    setup
+  end
  
-    def setup
-      warn_user_is_not_gitlab
+  def setup
+    warn_user_is_not_gitlab
  
-      puts "This will create the necessary database tables and seed the database."
-      puts "You will lose any previous data stored in the database."
-      ask_to_continue
-      puts ""
+    puts "This will create the necessary database tables and seed the database."
+    puts "You will lose any previous data stored in the database."
+    ask_to_continue
+    puts ""
  
-      Rake::Task["db:setup"].invoke
-      Rake::Task["db:seed_fu"].invoke
-      Rake::Task["gitlab:enable_automerge"].invoke
-    rescue Gitlab::TaskAbortedByUserError
-      puts "Quitting...".red
-      exit 1
-    end
+    Rake::Task["db:setup"].invoke
+    Rake::Task["db:seed_fu"].invoke
+    Rake::Task["gitlab:enable_automerge"].invoke
+  rescue Gitlab::TaskAbortedByUserError
+    puts "Quitting...".red
+    exit 1
   end
 end
...	...	@@ -260,7 +260,7 @@ used for the `email.from` setting in `config/gitlab.yml`)
260	260
261	261	## Initialise Database and Activate Advanced Features
262	262
263		- sudo -u gitlab -H bundle exec rake gitlab:app:setup RAILS_ENV=production
	263	+ sudo -u gitlab -H bundle exec rake gitlab:setup RAILS_ENV=production
264	264
265	265
266	266	## Install Init Script
...	...
1	1	namespace :gitlab do
2		- namespace :app do
3		- desc "GITLAB \| Setup production application"
4		- task :setup => :environment do
5		- setup
6		- end
	2	+ desc "GITLAB \| Setup production application"
	3	+ task :setup => :environment do
	4	+ setup
	5	+ end
7	6
8		- def setup
9		- warn_user_is_not_gitlab
	7	+ def setup
	8	+ warn_user_is_not_gitlab
10	9
11		- puts "This will create the necessary database tables and seed the database."
12		- puts "You will lose any previous data stored in the database."
13		- ask_to_continue
14		- puts ""
	10	+ puts "This will create the necessary database tables and seed the database."
	11	+ puts "You will lose any previous data stored in the database."
	12	+ ask_to_continue
	13	+ puts ""
15	14
16		- Rake::Task["db:setup"].invoke
17		- Rake::Task["db:seed_fu"].invoke
18		- Rake::Task["gitlab:enable_automerge"].invoke
19		- rescue Gitlab::TaskAbortedByUserError
20		- puts "Quitting...".red
21		- exit 1
22		- end
	15	+ Rake::Task["db:setup"].invoke
	16	+ Rake::Task["db:seed_fu"].invoke
	17	+ Rake::Task["gitlab:enable_automerge"].invoke
	18	+ rescue Gitlab::TaskAbortedByUserError
	19	+ puts "Quitting...".red
	20	+ exit 1
23	21	end
24	22	end
...	...