summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_resolves_conflicts_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* 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