summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-30 17:41:43 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-30 17:41:43 +0000
commita8e80d4a59a4e071c61a2789611aaf7a300bf8f8 (patch)
tree8e6e959c35bb6959155a55576271c94a6974b7ed
parent38e0e399de115111fdbbfd890503519ad58e29a3 (diff)
parentf0375f8226a28e95dbac54156fa55926b8c5def4 (diff)
downloadgitlab-ce-a8e80d4a59a4e071c61a2789611aaf7a300bf8f8.tar.gz
Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master'
Enable Style/IndentAssignment Rubocop style cop Checks the indentation of the first line of the right-hand-side of a multi-line assignment. See #17478 See merge request !4348
-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 089ae7adbcf..f547852763b 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
#