summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 10:24:02 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 10:24:02 +0200
commit21620943b030ce8e59fff2fd994ae83446de3889 (patch)
tree30fb8d6eb6eb0a48677c1be19eb918b34efd8912
parent43c35b0f20fb3bb67ea2b96bf8f806c7e95b6aec (diff)
downloadgitlab-ce-style/enable-block-alignment-rubocop-lint.tar.gz
Enable Lint/BlockAlignment Rubocop copstyle/enable-block-alignment-rubocop-lint
See #17478
-rw-r--r--.rubocop.yml2
-rw-r--r--app/helpers/issues_helper.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..35f603c896f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -785,7 +785,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