diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-21 17:32:18 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:31:56 -0600 |
| commit | b7d8df503cf35b3048b273dc0cadb5ec39aac5e1 (patch) | |
| tree | 0edbdd9158baa535b12831a3d4860b73894df9ab /spec/features/merge_requests/conflicts_spec.rb | |
| parent | 3dadf306ddc81183e74b048bc4119796852ed7ea (diff) | |
| download | gitlab-ce-b7d8df503cf35b3048b273dc0cadb5ec39aac5e1.tar.gz | |
Enable Style/MutableConstant
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index d710a780111..18508a44184 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -154,7 +154,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do 'conflict-binary-file' => 'when the conflicts contain a binary file', 'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another', 'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file', - } + }.freeze UNRESOLVABLE_CONFLICTS.each do |source_branch, description| context description do |