summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 10:45:10 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 10:45:10 +0200
commitf0375f8226a28e95dbac54156fa55926b8c5def4 (patch)
tree7d2bf530e48ec4571e90cd593ad24e5a91506e35
parent43c35b0f20fb3bb67ea2b96bf8f806c7e95b6aec (diff)
downloadgitlab-ce-style/enable-rubocop-indent-assignment-cop.tar.gz
Enable Style/IndentAssignment Rubocop style copstyle/enable-rubocop-indent-assignment-cop
See #17478
-rw-r--r--.rubocop.yml2
-rw-r--r--lib/api/licenses.rb14
2 files changed, 8 insertions, 8 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..8dd37259d9f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -286,7 +286,7 @@ Style/IdenticalConditionalBranches:
# Checks the indentation of the first line of the right-hand-side of a
# multi-line assignment.
Style/IndentAssignment:
- Enabled: false
+ Enabled: true
# Keep indentation straight.
Style/IndentationConsistency:
diff --git a/lib/api/licenses.rb b/lib/api/licenses.rb
index 187d2c04703..be0e113fbcb 100644
--- a/lib/api/licenses.rb
+++ b/lib/api/licenses.rb
@@ -2,15 +2,15 @@ module API
# Licenses API
class Licenses < Grape::API
PROJECT_TEMPLATE_REGEX =
- /[\<\{\[]
- (project|description|
- one\sline\s.+\swhat\sit\sdoes\.) # matching the start and end is enough here
- [\>\}\]]/xi.freeze
+ /[\<\{\[]
+ (project|description|
+ one\sline\s.+\swhat\sit\sdoes\.) # matching the start and end is enough here
+ [\>\}\]]/xi.freeze
YEAR_TEMPLATE_REGEX = /[<{\[](year|yyyy)[>}\]]/i.freeze
FULLNAME_TEMPLATE_REGEX =
- /[\<\{\[]
- (fullname|name\sof\s(author|copyright\sowner))
- [\>\}\]]/xi.freeze
+ /[\<\{\[]
+ (fullname|name\sof\s(author|copyright\sowner))
+ [\>\}\]]/xi.freeze
# Get the list of the available license templates
#