summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_resolves_conflicts_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-5/+0
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-4/+4
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-181-1/+1
* Add latest changes from gitlab-org/gitlab@13-0-stable-eeGitLab Bot2020-05-201-2/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-061-2/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-141-3/+0
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-111-1/+4
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-181-1/+1
* Replace rails_helper.rb with spec_helper.rb66741-remove-spec-rails_helper-rbAsh McKenzie2019-08-301-1/+1
* Add frozen_string_literal to spec/featuresThong Kuah2019-07-261-0/+2
* Fix XSS in resolve conflicts formPaul Slaughter2019-03-071-0/+15
* Update spec/features/merge_request/user_resolves_conflicts_spec.rbPhil Hughes2019-02-071-0/+2
* Re-enables merge conflicts resolution specPhil Hughes2018-09-111-14/+4
* Changes tab VUE refactoringFelipe Artur2018-06-211-5/+16
* Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-241-1/+1
|\
| * Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
* | Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-3/+3
|/
* Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-5/+5
* Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specsRémy Coutable2018-01-181-0/+195