diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-30 17:26:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-30 17:26:57 +0000 |
| commit | c61cf41defd4c1e44d519bedc2f9648d6554f5d2 (patch) | |
| tree | 33f8825b60dcd2a6c643c859e494bad808581a2d | |
| parent | 6eaf327a57149739fb6b14e2396181cc95e687ff (diff) | |
| parent | 21620943b030ce8e59fff2fd994ae83446de3889 (diff) | |
| download | gitlab-ce-c61cf41defd4c1e44d519bedc2f9648d6554f5d2.tar.gz | |
Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master'
Enable Lint/BlockAlignment Rubocop cop
See #17478
See merge request !4346
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | app/helpers/issues_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 6bba7f70668..966793f792c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -784,7 +784,7 @@ Lint/AssignmentInCondition: # Align block ends correctly. Lint/BlockAlignment: - Enabled: false + Enabled: true # Default values in optional keyword arguments and optional ordinal arguments # should not refer back to the name of the argument. diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 551409e8855..173bdbb8654 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -147,8 +147,8 @@ module IssuesHelper def emoji_author_list(notes, current_user) list = notes.map do |note| - note.author == current_user ? "me" : note.author.name - end + note.author == current_user ? "me" : note.author.name + end list.join(", ") end |