diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-20 16:26:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-20 16:26:04 +0000 |
| commit | 6f8156cea587f08e11ad578bec012af103cc82e4 (patch) | |
| tree | 9676f19b4bd627ebf6e545d78deacbe972246dd3 /lib | |
| parent | 639942ef01791ca37362bb2ba9716b6745f7025f (diff) | |
| parent | 07be5943788fe0b672e8c6bea6859582cbdd3d11 (diff) | |
| download | gitlab-ce-6f8156cea587f08e11ad578bec012af103cc82e4.tar.gz | |
Merge branch 'rubocop/enable-multiline-ternary-operator-cop' into 'master'
Enable Style/MultilineTernaryOperator rubocop cop
Avoid multi-line ?: (the ternary operator). Use if/unless instead.
See #17478
See merge request !4356
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/relative_link_filter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb index c78da404607..21ed0410f7f 100644 --- a/lib/banzai/filter/relative_link_filter.rb +++ b/lib/banzai/filter/relative_link_filter.rb @@ -112,8 +112,7 @@ module Banzai end def current_commit - @current_commit ||= context[:commit] || - ref ? repository.commit(ref) : repository.head_commit + @current_commit ||= context[:commit] || ref ? repository.commit(ref) : repository.head_commit end def relative_url_root |