diff options
| -rw-r--r-- | db/schema.rb | 5 | ||||
| -rw-r--r-- | lib/tasks/gitlab/enable_automerge.rake | 12 | ||||
| -rw-r--r-- | lib/tasks/gitlab/setup.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab_enable_automerge.rake | 9 |
4 files changed, 16 insertions, 12 deletions
diff --git a/db/schema.rb b/db/schema.rb index fc37d0b0139..b1c2cf19f67 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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 => 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" diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake new file mode 100644 index 00000000000..5136011e0c7 --- /dev/null +++ b/lib/tasks/gitlab/enable_automerge.rake @@ -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 diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index ca0f064baff..d60e73e9ac3 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -1,7 +1,7 @@ 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 diff --git a/lib/tasks/gitlab_enable_automerge.rake b/lib/tasks/gitlab_enable_automerge.rake deleted file mode 100644 index 6ff5003eac1..00000000000 --- a/lib/tasks/gitlab_enable_automerge.rake +++ /dev/null @@ -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 |