Fixed db_schema & reordered rake tasks

Dmitriy Zaporozhets
1 parent 08994f3f
Showing 4 changed files with 16 additions and 12 deletions Show diff stats
db/schema.rb
lib/tasks/gitlab/enable_automerge.rake
lib/tasks/gitlab/setup.rake
lib/tasks/gitlab_enable_automerge.rake
@@ -11,7 +11,8 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20120329170745) do
+ActiveRecord::Schema.define(:version => 20120413135904) do
+
   create_table "events", :force => true do |t|
     t.string   "target_type"
     t.integer  "target_id"
@@ -64,7 +65,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120329170745) do
     t.text     "st_commits",    :limit => 2147483647
     t.text     "st_diffs",      :limit => 2147483647
     t.boolean  "merged",                              :default => false, :null => false
-    t.boolean  "auto_merge",    :default => true,  :null => false
+    t.integer  "state",                               :default => 1,     :null => false
   end
  
   add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
@@ -0,0 +1,12 @@
+namespace :gitlab do
+  namespace :app do
+    desc "GITLAB | Enable auto merge"
+    task :enable_automerge => :environment  do
+      Gitlabhq::GitHost.system.new.configure do |git|
+        git.admin_all_repo
+      end
+
+      puts "Done!".green
+    end
+  end
+end
 namespace :gitlab do
   namespace :app do
     desc "GITLAB | Setup production application"
-    task :setup => ['db:setup', 'db:seed_fu']
+    task :setup => ['db:setup', 'db:seed_fu', 'gitlab:app:enable_automerge']
   end
 end
  
@@ -1,9 +0,0 @@
-desc "Give gitlab user full access to every repo"
-task :gitlab_enable_automerge => :environment  do
-
-  Gitlabhq::GitHost.system.new.configure do |git|
-    git.admin_all_repo
-  end
-
-  puts "Done!".green
-end
...	...	@@ -11,7 +11,8 @@
11	11	#
12	12	# It's strongly recommended to check this file into your version control system.
13	13
14		-ActiveRecord::Schema.define(:version => 20120329170745) do
	14	+ActiveRecord::Schema.define(:version => 20120413135904) do
	15	+
15	16	create_table "events", :force => true do \|t\|
16	17	t.string "target_type"
17	18	t.integer "target_id"
...	...	@@ -64,7 +65,7 @@ ActiveRecord::Schema.define(:version => 20120329170745) do
64	65	t.text "st_commits", :limit => 2147483647
65	66	t.text "st_diffs", :limit => 2147483647
66	67	t.boolean "merged", :default => false, :null => false
67		- t.boolean "auto_merge", :default => true, :null => false
	68	+ t.integer "state", :default => 1, :null => false
68	69	end
69	70
70	71	add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
...	...
...	...	@@ -0,0 +1,12 @@
	1	+namespace :gitlab do
	2	+ namespace :app do
	3	+ desc "GITLAB \| Enable auto merge"
	4	+ task :enable_automerge => :environment do
	5	+ Gitlabhq::GitHost.system.new.configure do \|git\|
	6	+ git.admin_all_repo
	7	+ end
	8	+
	9	+ puts "Done!".green
	10	+ end
	11	+ end
	12	+end
...	...
1	1	namespace :gitlab do
2	2	namespace :app do
3	3	desc "GITLAB \| Setup production application"
4		- task :setup => ['db:setup', 'db:seed_fu']
	4	+ task :setup => ['db:setup', 'db:seed_fu', 'gitlab:app:enable_automerge']
5	5	end
6	6	end
7	7
...	...
...	...	@@ -1,9 +0,0 @@
1		-desc "Give gitlab user full access to every repo"
2		-task :gitlab_enable_automerge => :environment do
3		-
4		- Gitlabhq::GitHost.system.new.configure do \|git\|
5		- git.admin_all_repo
6		- end
7		-
8		- puts "Done!".green
9		-end