diff options
author | Rémy Coutable <remy@rymai.me> | 2017-05-03 13:22:03 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-05-10 18:25:45 +0200 |
commit | d40e1f547ea9e31e822229bb808aaa6b9201f473 (patch) | |
tree | 8beb6e97346fb7ae31965aed1e1b37e4a4dd23e2 /spec/features/merge_requests/conflicts_spec.rb | |
parent | 566ee14516ac54e52c4dfaf40d10bc5f2abc3627 (diff) | |
download | gitlab-ce-d40e1f547ea9e31e822229bb808aaa6b9201f473.tar.gz |
Enable the Style/TrailingCommaInLiteral cop
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
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 43977ad2fc5..04b7593ce68 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -151,7 +151,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do 'conflict-too-large' => 'when the conflicts contain a large file', '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', + 'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file' }.freeze UNRESOLVABLE_CONFLICTS.each do |source_branch, description| |