diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-06-08 14:57:17 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-06-08 14:57:17 +0300 |
| commit | 48cf44c501b00c7897f061cd8784e6df21d4f568 (patch) | |
| tree | 34600c02df87a71cbf77affd45827eca163d6193 | |
| parent | 0d37a6fe5948324edcf918a121c1b22e046a8b89 (diff) | |
| parent | b3e79034fd02a38057abc19b65a659e4b0cb07e4 (diff) | |
Merge branch 'eread/fix-mixin-usage-rubocop-offenses' into 'main'
Fix Style/MixinUsage RuboCop offenses
See merge request gitlab-org/gitlab-docs!2774
| -rw-r--r-- | lib/gitlab/symlinks_converter.rb | 3 | ||||
| -rw-r--r-- | lib/helpers_.rb | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/gitlab/symlinks_converter.rb b/lib/gitlab/symlinks_converter.rb index 48b6a732..043a5042 100644 --- a/lib/gitlab/symlinks_converter.rb +++ b/lib/gitlab/symlinks_converter.rb @@ -2,6 +2,7 @@ module Gitlab class SymlinksConverter + include Nanoc::Helpers::Generic EXTENSIONS = %w[png jpg gif svg].freeze def initialize(config, items) @@ -14,7 +15,7 @@ module Gitlab end def run - return unless Nanoc::Helpers::Generic.omnibus? + return unless omnibus? items.each do |item| id = item.identifier diff --git a/lib/helpers_.rb b/lib/helpers_.rb index 202d0576..6037d04c 100644 --- a/lib/helpers_.rb +++ b/lib/helpers_.rb @@ -1,11 +1,10 @@ # frozen_string_literal: true -include Nanoc::Helpers::LinkTo -include Nanoc::Helpers::XMLSitemap -include Nanoc::Helpers::Rendering -include Nanoc::Helpers::EditOnGitLab -include Nanoc::Helpers::VersionsDropdown -include Nanoc::Helpers::IconsHelper -include Nanoc::Helpers::ReadingTimeHelper -include Nanoc::Helpers::Generic -include Nanoc::Helpers::GitLabKramdown +use_helper Nanoc::Helpers::EditOnGitLab +use_helper Nanoc::Helpers::Generic +use_helper Nanoc::Helpers::GitLabKramdown +use_helper Nanoc::Helpers::IconsHelper +use_helper Nanoc::Helpers::ReadingTimeHelper +use_helper Nanoc::Helpers::Rendering +use_helper Nanoc::Helpers::VersionsDropdown +use_helper Nanoc::Helpers::XMLSitemap |