diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 12:22:56 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 12:22:56 +0300 |
| commit | 08994f3f6034eb214de4cda304d8797a51b2397a (patch) | |
| tree | 4a2b2cf4d3dec5c9300bbd25a6dc4091cd80a14d /db/migrate | |
| parent | 9af14e4bda3586d520c576911ecf109879f41aed (diff) | |
| parent | 3a6694b5516f4c5015a7745cf8182e74597b39ad (diff) | |
| download | gitlab-ce-08994f3f6034eb214de4cda304d8797a51b2397a.tar.gz | |
Merge remote-tracking branch 'origin/merge_button'
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20120329170745_add_automerge_to_merge_request.rb | 5 |
1 files changed, 5 insertions, 0 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 |