Commit graph

17 commits

Author SHA1 Message Date
GitLab Bot
4f5c8572e9 Add latest changes from gitlab-org/gitlab@master 2020-06-16 18:09:01 +00:00
GitLab Bot
f44809bf96 Add latest changes from gitlab-org/gitlab@master 2020-05-05 12:09:31 +00:00
GitLab Bot
0d6fa03312 Add latest changes from gitlab-org/gitlab@master 2020-02-06 18:08:54 +00:00
GitLab Bot
4ce0bee95d Add latest changes from gitlab-org/gitlab@master 2020-01-14 12:07:41 +00:00
GitLab Bot
991a295378 Add latest changes from gitlab-org/gitlab@master 2019-11-11 00:06:26 +00:00
GitLab Bot
80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Ash McKenzie
19ff9d9899
Replace rails_helper.rb with spec_helper.rb
rails_helper.rb's only logic was to require
spec_helper.rb.
2019-08-30 12:26:18 +10:00
Thong Kuah
73e848850c Add frozen_string_literal to spec/features
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:23:30 +12:00
Paul Slaughter
e6e9c10ee1
Fix XSS in resolve conflicts form
The issue arose when the branch name contained Vue template
JavaScript. The fix is to use `v-pre` which disables Vue
compilation in a template.
2019-03-07 01:54:16 -06:00
Phil Hughes
c48dbcf0c0 Update spec/features/merge_request/user_resolves_conflicts_spec.rb 2019-02-07 11:36:43 +00:00
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
Renamed from spec/features/merge_requests/conflicts_spec.rb (Browse further)