diff options
author | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-11-20 09:22:14 +0000 |
commit | 4f09d099e9fa29659917f87c2dc25f2b9aa05b5e (patch) | |
tree | a70a9b3d42c8d3762974d354b31aa611590f55b8 /spec/factories/notes.rb | |
parent | 135437b70d5bf12fff17d10adeae0c459b779138 (diff) | |
parent | 181cd299f9e06223e8338e93b1c318c671ccb1aa (diff) | |
download | gitlab-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 'spec/factories/notes.rb')
-rw-r--r-- | spec/factories/notes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index f0d05504b7e..ab4ae123429 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -130,6 +130,7 @@ FactoryGirl.define do before(:create) do |note, evaluator| discussion = evaluator.in_reply_to next unless discussion + discussion = discussion.to_discussion if discussion.is_a?(Note) next unless discussion |