diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-05-21 18:14:22 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-06-20 11:48:30 -0300 |
| commit | 3af348b6cf28ef1d9d3025f7012049132b57798c (patch) | |
| tree | 540b724d6b711e3d2247dad5c371b54ec81ea610 /db/schema.rb | |
| parent | c6eb18ee0fe1b887438da87f25fc2f2a852dd393 (diff) | |
| download | gitlab-ce-3af348b6cf28ef1d9d3025f7012049132b57798c.tar.gz | |
Automatically update MR merge-ref along merge status
This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.
In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.
We've also updated the logic to be more systematic and less user-based.
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 4e333633a8b..e35c79439ef 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20190619175843) do +ActiveRecord::Schema.define(version: 20190620112608) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |