diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 18:21:45 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 18:21:45 +0100 |
| commit | d66c48b303b00b731540dfa928ea151295ced5d4 (patch) | |
| tree | 48001cbfb4f8d0e96bf210df93a2e96d8cbf7805 /db/schema.rb | |
| parent | f40373329f34b56647945522fccad3202ceafcde (diff) | |
| parent | 3d162d192ba2a57776de62b553a2a0a9a9245f8a (diff) | |
| download | gitlab-ce-d66c48b303b00b731540dfa928ea151295ced5d4.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index ccaf35b4d92..e6a2ea4c862 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171229225929) do +ActiveRecord::Schema.define(version: 20171230123729) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1099,6 +1099,7 @@ ActiveRecord::Schema.define(version: 20171229225929) do t.string "merge_jid" t.boolean "discussion_locked" t.integer "latest_merge_request_diff_id" + t.string "rebase_commit_sha" end add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree |