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 | |
| 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')
| -rw-r--r-- | spec/features/auto_deploy_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/features_visibility_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb index 67b0f006854..eba1bca83a8 100644 --- a/spec/features/auto_deploy_spec.rb +++ b/spec/features/auto_deploy_spec.rb @@ -10,7 +10,7 @@ describe 'Auto deploy' do properties: { namespace: project.path, api_url: 'https://kubernetes.example.com', - token: 'a' * 40, + token: 'a' * 40 } ) project.team << [user, :master] 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| diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb index e1781cf320a..4533a6fb144 100644 --- a/spec/features/projects/features_visibility_spec.rb +++ b/spec/features/projects/features_visibility_spec.rb @@ -74,7 +74,7 @@ describe 'Edit Project Settings', feature: true do issues: namespace_project_issues_path(project.namespace, project), wiki: namespace_project_wiki_path(project.namespace, project, :home), snippets: namespace_project_snippets_path(project.namespace, project), - merge_requests: namespace_project_merge_requests_path(project.namespace, project), + merge_requests: namespace_project_merge_requests_path(project.namespace, project) } end |