From 65c35466b695b06807c997859ce4ca5b515b6550 Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Thu, 17 Jan 2013 21:26:22 +0100
Subject: [PATCH] Rename gitlab:app:setup task to gitlab:setup

---
 doc/install/installation.md |  2 +-
 lib/tasks/gitlab/setup.rake | 34 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 12a0cc917be..811f8a45f42 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -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
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index ce6d0eb363d..5699e5d6188 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -1,24 +1,22 @@
 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