Add latest changes from gitlab-org/gitlab@master

7 files changed, 7 insertions, 8 deletions

diff --git a/rubocop/cop/active_record_association_reload.rb b/rubocop/cop/active_record_association_reload.rb
index dc241cab7d0..eb9fc8a0246 100644
--- a/rubocop/cop/active_record_association_reload.rb
+++ b/rubocop/cop/active_record_association_reload.rb
@@ -5,7 +5,7 @@ module RuboCop
     # Cop that blacklists the use of `reload`.
     class ActiveRecordAssociationReload < RuboCop::Cop::Cop
       MSG = 'Use reset instead of reload. ' \
-        'For more details check the https://gitlab.com/gitlab-org/gitlab-ce/issues/60218.'
+        'For more details check the https://gitlab.com/gitlab-org/gitlab-foss/issues/60218.'
 
       def_node_matcher :reload?, <<~PATTERN
         (send _ :reload ...)
diff --git a/rubocop/cop/avoid_break_from_strong_memoize.rb b/rubocop/cop/avoid_break_from_strong_memoize.rb
index 9b436118db3..a3a8d0c3990 100644
--- a/rubocop/cop/avoid_break_from_strong_memoize.rb
+++ b/rubocop/cop/avoid_break_from_strong_memoize.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # Checks for break inside strong_memoize blocks.
-    # For more information see: https://gitlab.com/gitlab-org/gitlab-ce/issues/42889
+    # For more information see: https://gitlab.com/gitlab-org/gitlab-foss/issues/42889
     #
     # @example
     #   # bad
diff --git a/rubocop/cop/avoid_return_from_blocks.rb b/rubocop/cop/avoid_return_from_blocks.rb
index 40b2aed019f..cc1868f10a4 100644
--- a/rubocop/cop/avoid_return_from_blocks.rb
+++ b/rubocop/cop/avoid_return_from_blocks.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # Checks for return inside blocks.
-    # For more information see: https://gitlab.com/gitlab-org/gitlab-ce/issues/42889
+    # For more information see: https://gitlab.com/gitlab-org/gitlab-foss/issues/42889
     #
     # @example
     #   # bad
diff --git a/rubocop/cop/avoid_route_redirect_leading_slash.rb b/rubocop/cop/avoid_route_redirect_leading_slash.rb
index 7ac1c881269..261d151fb1b 100644
--- a/rubocop/cop/avoid_route_redirect_leading_slash.rb
+++ b/rubocop/cop/avoid_route_redirect_leading_slash.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # Checks for a leading '/' in route redirects
-    # For more information see: https://gitlab.com/gitlab-org/gitlab-ce/issues/50645
+    # For more information see: https://gitlab.com/gitlab-org/gitlab-foss/issues/50645
     #
     # @example
     #   # bad
diff --git a/rubocop/cop/code_reuse/active_record.rb b/rubocop/cop/code_reuse/active_record.rb
index 1e650abfceb..8c77c292315 100644
--- a/rubocop/cop/code_reuse/active_record.rb
+++ b/rubocop/cop/code_reuse/active_record.rb
@@ -10,7 +10,7 @@ module RuboCop
         include CodeReuseHelpers
 
         MSG = 'This method can only be used inside an ActiveRecord model: ' \
-        'https://gitlab.com/gitlab-org/gitlab-ce/issues/49653'
+        'https://gitlab.com/gitlab-org/gitlab-foss/issues/49653'
 
         # Various methods from ActiveRecord::Querying that are blacklisted. We
         # exclude some generic ones such as `any?` and `first`, as these may
@@ -27,7 +27,6 @@ module RuboCop
           create_with: true,
           distinct: false,
           eager_load: true,
-          except: true,
           exists?: true,
           find_by: true,
           find_by!: true,
diff --git a/rubocop/cop/migration/safer_boolean_column.rb b/rubocop/cop/migration/safer_boolean_column.rb
index a7d922c752f..fa524efe5be 100644
--- a/rubocop/cop/migration/safer_boolean_column.rb
+++ b/rubocop/cop/migration/safer_boolean_column.rb
@@ -14,7 +14,7 @@ module RuboCop
       # A developer might otherwise mistakenly assume that a value in
       # `ApplicationSetting.defaults` is sufficient.
       #
-      # See https://gitlab.com/gitlab-org/gitlab-ee/issues/2750 for more
+      # See https://gitlab.com/gitlab-org/gitlab/issues/2750 for more
       # information.
       class SaferBooleanColumn < RuboCop::Cop::Cop
         include MigrationHelpers
diff --git a/rubocop/cop/prefer_class_methods_over_module.rb b/rubocop/cop/prefer_class_methods_over_module.rb
index 0dfa80ccfab..39b65073477 100644
--- a/rubocop/cop/prefer_class_methods_over_module.rb
+++ b/rubocop/cop/prefer_class_methods_over_module.rb
@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     # Enforces the use of 'class_methods' instead of 'module ClassMethods' for activesupport concerns.
-    # For more information see: https://gitlab.com/gitlab-org/gitlab-ce/issues/50414
+    # For more information see: https://gitlab.com/gitlab-org/gitlab-foss/issues/50414
     #
     # @example
     #   # bad