diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-19 18:39:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-19 19:55:19 +0100 |
| commit | 0daef5bfd780427c2f76fcd750cbecf7e0a5f575 (patch) | |
| tree | 4b29d8fc43e368637bdadffc740a1bc44ffb9a26 /db | |
| parent | 441896589efd9d2730e7c0598ea23eef6eab8aad (diff) | |
| download | gitlab-ce-0daef5bfd780427c2f76fcd750cbecf7e0a5f575.tar.gz | |
Merge branch 'issue_3409' into 'master'
Add ability to revert changes introduced by Merge Requests or Commits
Closes #3409
See merge request !1990
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb b/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb new file mode 100644 index 00000000000..f0d94226514 --- /dev/null +++ b/db/migrate/20160129155512_add_merge_commit_sha_to_merge_requests.rb @@ -0,0 +1,5 @@ +class AddMergeCommitShaToMergeRequests < ActiveRecord::Migration + def change + add_column :merge_requests, :merge_commit_sha, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 2d1c6dbf0e4..344c384b6d0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -525,6 +525,7 @@ ActiveRecord::Schema.define(version: 20160209130428) do t.text "merge_params" t.boolean "merge_when_build_succeeds", default: false, null: false t.integer "merge_user_id" + t.string "merge_commit_sha" end add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree |