diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1885c3f5a204f1ef2aafd614bb59b0bd3db4f648..63b1685fedaa66fa53a32a1b12ffc9b8d25936f5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-05-04 06:02:16 +0000 using RuboCop version 0.68.1.
+# on 2019-05-04 16:01:00 +0000 using RuboCop version 0.68.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -10,14 +10,14 @@
 Capybara/CurrentPathExpectation:
   Enabled: false
 
-# Offense count: 1096
+# Offense count: 1097
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/AlignArguments:
   Enabled: false
 
-# Offense count: 822
+# Offense count: 824
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -81,14 +81,14 @@ Layout/EmptyLinesAroundArguments:
     - 'lib/banzai/pipeline/single_line_pipeline.rb'
     - 'spec/features/markdown/copy_as_gfm_spec.rb'
 
-# Offense count: 158
+# Offense count: 160
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Layout/IndentFirstArrayElement:
   Enabled: false
 
-# Offense count: 629
+# Offense count: 631
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
@@ -117,7 +117,7 @@ Layout/LeadingBlankLines:
     - 'lib/tasks/yarn.rake'
     - 'spec/javascripts/fixtures/merge_requests_diffs.rb'
 
-# Offense count: 28
+# Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
@@ -148,7 +148,7 @@ Layout/RescueEnsureAlignment:
 Layout/SpaceInLambdaLiteral:
   Enabled: false
 
-# Offense count: 578
+# Offense count: 583
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -156,7 +156,7 @@ Layout/SpaceInLambdaLiteral:
 Layout/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 252
+# Offense count: 255
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
@@ -256,7 +256,7 @@ Naming/HeredocDelimiterCase:
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
-# Offense count: 121
+# Offense count: 125
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
 Naming/RescuedExceptionsVariableName:
@@ -281,7 +281,7 @@ Performance/ReverseEach:
     - 'db/migrate/20190222051615_add_indexes_for_merge_request_diffs_query.rb'
     - 'lib/gitlab/profiler.rb'
 
-# Offense count: 7050
+# Offense count: 7081
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -354,14 +354,14 @@ RSpec/OverwritingSetup:
     - 'spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb'
     - 'spec/services/notes/quick_actions_service_spec.rb'
 
-# Offense count: 1825
+# Offense count: 1828
 # Cop supports --auto-correct.
 # Configuration parameters: Strict, EnforcedStyle.
 # SupportedStyles: inflected, explicit
 RSpec/PredicateMatcher:
   Enabled: false
 
-# Offense count: 55
+# Offense count: 57
 RSpec/RepeatedExample:
   Enabled: false
 
@@ -604,7 +604,7 @@ Style/EvalWithLocation:
 Style/FormatString:
   Enabled: false
 
-# Offense count: 667
+# Offense count: 669
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
@@ -613,12 +613,12 @@ Style/GuardClause:
 Style/IfInsideElse:
   Enabled: false
 
-# Offense count: 1344
+# Offense count: 1346
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 183
+# Offense count: 186
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: line_count_dependent, lambda, literal
@@ -650,7 +650,7 @@ Style/MixinUsage:
     - 'spec/lib/gitlab/import_export/project_tree_restorer_spec.rb'
     - 'spec/lib/gitlab/import_export/version_checker_spec.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
   Exclude:
@@ -658,7 +658,6 @@ Style/MultilineIfModifier:
     - 'app/models/project_wiki.rb'
     - 'app/services/ci/process_pipeline_service.rb'
     - 'lib/api/commit_statuses.rb'
-    - 'lib/gitlab/ci/trace.rb'
 
 # Offense count: 72
 # Cop supports --auto-correct.
@@ -688,7 +687,7 @@ Style/Next:
 Style/NumericLiteralPrefix:
   Enabled: false
 
-# Offense count: 185
+# Offense count: 186
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
@@ -707,7 +706,7 @@ Style/OrAssignment:
 Style/ParallelAssignment:
   Enabled: false
 
-# Offense count: 1383
+# Offense count: 1390
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -770,7 +769,7 @@ Style/RedundantReturn:
     - 'lib/gitlab/utils.rb'
     - 'lib/google_api/auth.rb'
 
-# Offense count: 701
+# Offense count: 700
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Enabled: false
@@ -896,7 +895,7 @@ Style/UnneededCondition:
     - 'lib/gitlab/prometheus_client.rb'
     - 'spec/lib/rspec_flaky/flaky_example_spec.rb'
 
-# Offense count: 71
+# Offense count: 73
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
   Enabled: false