Merge branch 'eread/fix-even-more-rubocop-problems' into 'master'

Fix even more Rubocop problems

See merge request gitlab-org/gitlab-docs!1308

5 files changed, 9 insertions, 16 deletions

diff --git a/lib/filters/admonition.rb b/lib/filters/admonition.rb
index d15eb774..43eff152 100644
--- a/lib/filters/admonition.rb
+++ b/lib/filters/admonition.rb
@@ -33,8 +33,6 @@ class AdmonitionFilter < Nanoc::Filter
   def generate(kind, content)
     %(<div class="admonition-wrapper #{kind}">) +
       %(<div class="admonition alert alert-#{BOOTSTRAP_MAPPING[kind]}">) +
-      %(<i class="fa fa-#{FONT_AWESOME_MAPPING[kind]} fa-fw" aria-hidden="true"></i>) +
-      content +
-      %(</div></div>)
+      %(<i class="fa fa-#{FONT_AWESOME_MAPPING[kind]} fa-fw" aria-hidden="true"></i>#{content}</div></div>)
   end
 end
diff --git a/lib/filters/gitlab_kramdown.rb b/lib/filters/gitlab_kramdown.rb
index bbe5174f..74550c62 100644
--- a/lib/filters/gitlab_kramdown.rb
+++ b/lib/filters/gitlab_kramdown.rb
@@ -39,9 +39,9 @@ module Nanoc::Filters
       end
 
       if warnings.any?
-        $stderr.puts "\nkramdown warning(s) for #{@item_rep.inspect}"
+        warn "\nkramdown warning(s) for #{@item_rep.inspect}"
         warnings.each do |warning|
-          $stderr.puts "  #{warning}"
+          warn "  #{warning}"
         end
       end
 
diff --git a/lib/filters/introduced_in.rb b/lib/filters/introduced_in.rb
index dd64ebf2..27f4a892 100644
--- a/lib/filters/introduced_in.rb
+++ b/lib/filters/introduced_in.rb
@@ -23,14 +23,9 @@ class IntroducedInFilter < Nanoc::Filter
       %(<div class="introduced-in mb-3">Version history) +
         %(<button class="text-expander" data-toggle="collapse" href="#release_version_notes_#{@incremental_id}" role="button" aria-expanded="false">) +
         %(</button>) +
-        %(<div class="introduced-in-content collapse" id="release_version_notes_#{@incremental_id}">) +
-        content +
-        %(</div>) +
-        %(</div>)
+        %(<div class="introduced-in-content collapse" id="release_version_notes_#{@incremental_id}">#{content}</div></div>)
     else
-      %(<div class="introduced-in">) +
-        content +
-        %(</div>)
+      %(<div class="introduced-in">#{content}</div>)
     end
   end
 end
diff --git a/lib/helpers/child_parent_better.rb b/lib/helpers/child_parent_better.rb
index 86dd6565..7c5f0fbb 100644
--- a/lib/helpers/child_parent_better.rb
+++ b/lib/helpers/child_parent_better.rb
@@ -35,8 +35,8 @@ module Nanoc::Helpers
         return get_nearest_parent(parent_dir)
       else
         parent_dir = item_identifier.sub(/[^\/]+$/, '').chop
-        parent = @items[parent_dir + '/README.*']
-        alt_parent = @items[parent_dir + '/index.*']
+        parent = @items["#{parent_dir}/README.*"]
+        alt_parent = @items["#{parent_dir}/index.*"]
         if (parent.nil? && alt_parent.nil?)
           get_nearest_parent(parent_dir)
         elsif alt_parent.nil?
diff --git a/lib/helpers/reading_time.rb b/lib/helpers/reading_time.rb
index 1f96dcf5..c336dec7 100644
--- a/lib/helpers/reading_time.rb
+++ b/lib/helpers/reading_time.rb
@@ -24,11 +24,11 @@ module Nanoc::Helpers
       minutes = (words / WPM).ceil
       seconds = (words % WPM / (WPM / 60)).floor
 
-      if seconds > 0
+      if seconds.positive?
         minutes += 1
       end
 
-      (minutes <= 1 ? 'about a minute' : '~' + minutes.to_s + ' minutes')
+      (minutes <= 1 ? 'about a minute' : "~#{minutes} minutes")
     end
   end
 end