diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 20:21:45 +0300 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 20:21:45 +0300 |
commit | d66c48b303b00b731540dfa928ea151295ced5d4 (patch) | |
tree | 48001cbfb4f8d0e96bf210df93a2e96d8cbf7805 /db | |
parent | f40373329f34b56647945522fccad3202ceafcde (diff) | |
parent | 3d162d192ba2a57776de62b553a2a0a9a9245f8a (diff) |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20171230123729_add_rebase_commit_sha_to_merge_requests.rb | 7 | ||||
-rw-r--r-- | db/post_migrate/20171221140220_schedule_issues_closed_at_type_change.rb | 2 | ||||
-rw-r--r-- | db/schema.rb | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/db/migrate/20171230123729_add_rebase_commit_sha_to_merge_requests.rb b/db/migrate/20171230123729_add_rebase_commit_sha_to_merge_requests.rb new file mode 100644 index 00000000000..2ce156fa92e --- /dev/null +++ b/db/migrate/20171230123729_add_rebase_commit_sha_to_merge_requests.rb @@ -0,0 +1,7 @@ +class AddRebaseCommitShaToMergeRequests < ActiveRecord::Migration + DOWNTIME = false + + def change + add_column :merge_requests, :rebase_commit_sha, :string + end +end diff --git a/db/post_migrate/20171221140220_schedule_issues_closed_at_type_change.rb b/db/post_migrate/20171221140220_schedule_issues_closed_at_type_change.rb index be18c5866ae..eeecc7b1de0 100644 --- a/db/post_migrate/20171221140220_schedule_issues_closed_at_type_change.rb +++ b/db/post_migrate/20171221140220_schedule_issues_closed_at_type_change.rb @@ -1,6 +1,6 @@ # See http://doc.gitlab.com/ce/development/migration_style_guide.html # for more information on how to write migrations for GitLab. - +# rubocop:disable Migration/Datetime class ScheduleIssuesClosedAtTypeChange < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers 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 |