Commit Graph

7 Commits

Author SHA1 Message Date
Phil Hughes ea1f388289
Re-enables merge conflicts resolution spec
https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
2018-09-11 08:47:51 +01:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Douwe Maan e97a87433b Merge branch 'mr-conflict-notification' into 'master'
MR unmergeable notification

See merge request gitlab-org/gitlab-ce!18042
2018-05-24 08:49:54 +00:00
Annabel Dunstone Gray 06a2e3854e
Make it explicit that merge conflict feature commits to source branch 2018-05-21 11:36:54 -07:00
lulalala 7517105303 Add cannot_be_merged_recheck merge_status
First, transitions between can_be_merged & cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).

We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` & `unchecked`.

So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407

Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
2018-05-17 08:54:47 +08:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
Rémy Coutable 799cd47109
Improve MR feature specs and reduce duplication
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-18 15:07:57 +01:00