diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 13:22:56 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 13:22:56 +0400 |
commit | 08994f3f6034eb214de4cda304d8797a51b2397a (patch) | |
tree | 4a2b2cf4d3dec5c9300bbd25a6dc4091cd80a14d /db | |
parent | 9af14e4bda3586d520c576911ecf109879f41aed (diff) | |
parent | 3a6694b5516f4c5015a7745cf8182e74597b39ad (diff) |
Merge remote-tracking branch 'origin/merge_button'
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20120329170745_add_automerge_to_merge_request.rb | 5 | ||||
-rw-r--r-- | db/schema.rb | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/db/migrate/20120329170745_add_automerge_to_merge_request.rb b/db/migrate/20120329170745_add_automerge_to_merge_request.rb new file mode 100644 index 00000000000..de7c68ee1cb --- /dev/null +++ b/db/migrate/20120329170745_add_automerge_to_merge_request.rb @@ -0,0 +1,5 @@ +class AddAutomergeToMergeRequest < ActiveRecord::Migration + def change + add_column :merge_requests, :state, :integer, :null => false, :default => 1 + end +end diff --git a/db/schema.rb b/db/schema.rb index b1419a4f6d8..fc37d0b0139 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,8 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120413135904) do - +ActiveRecord::Schema.define(:version => 20120329170745) do create_table "events", :force => true do |t| t.string "target_type" t.integer "target_id" @@ -65,6 +64,7 @@ ActiveRecord::Schema.define(:version => 20120413135904) 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 end add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id" |