Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-module

# Conflicts:
#   app/assets/javascripts/main.js

1 files changed, 3 insertions, 3 deletions

diff --git a/features/support/env.rb b/features/support/env.rb
index 5962745d501..91a92314959 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -27,7 +27,7 @@ Spinach.hooks.before_run do
   # web editor and merge
   TestEnv.disable_pre_receive
 
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
   include GitlabRoutingHelper
 end
 
@@ -42,11 +42,11 @@ module StdoutReporterWithScenarioLocation
   # Override the standard reporter to show filename and line number next to each
   # scenario for easy, focused re-runs
   def before_scenario_run(scenario, step_definitions = nil)
-    @max_step_name_length = scenario.steps.map(&:name).map(&:length).max if scenario.steps.any?
+    @max_step_name_length = scenario.steps.map(&:name).map(&:length).max if scenario.steps.any? # rubocop:disable Gitlab/ModuleWithInstanceVariables
     name = scenario.name
 
     # This number has no significance, it's just to line things up
-    max_length = @max_step_name_length + 19
+    max_length = @max_step_name_length + 19 # rubocop:disable Gitlab/ModuleWithInstanceVariables
     out.puts "\n  #{'Scenario:'.green} #{name.light_green.ljust(max_length)}" \
       " # #{scenario.feature.filename}:#{scenario.line}"
   end