summaryrefslogtreecommitdiff
path: root/rubocop/rubocop.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-20 09:22:14 +0000
committerRémy Coutable <remy@rymai.me>2017-11-20 09:22:14 +0000
commit4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch)
treea70a9b3d42c8d3762974d354b31aa611590f55b8 /rubocop/rubocop.rb
parent135437b70d5bf12fff17d10adeae0c459b779138 (diff)
parent181cd299f9e06223e8338e93b1c318c671ccb1aa (diff)
downloadgitlab-ce-4f09d099e9fa29659917f87c2dc25f2b9aa05b5e.tar.gz
Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
Diffstat (limited to 'rubocop/rubocop.rb')
-rw-r--r--rubocop/rubocop.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb
index a1668749dd9..7621ea50da9 100644
--- a/rubocop/rubocop.rb
+++ b/rubocop/rubocop.rb
@@ -3,6 +3,7 @@ require_relative 'cop/active_record_serialize'
require_relative 'cop/custom_error_class'
require_relative 'cop/gem_fetcher'
require_relative 'cop/in_batches'
+require_relative 'cop/line_break_after_guard_clauses'
require_relative 'cop/polymorphic_associations'
require_relative 'cop/project_path_helper'
require_relative 'cop/redirect_with_status'