diff --git a/.rubocop_todo/lint/redundant_safe_navigation.yml b/.rubocop_todo/lint/redundant_safe_navigation.yml deleted file mode 100644 index 3a41b80e311ad38bea9a455c2c3c99382c0737b5..0000000000000000000000000000000000000000 --- a/.rubocop_todo/lint/redundant_safe_navigation.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Cop supports --autocorrect. -Lint/RedundantSafeNavigation: - Exclude: - - 'app/controllers/import/base_controller.rb' - - 'app/graphql/resolvers/users_resolver.rb' - - 'app/graphql/types/countable_connection_type.rb' - - 'app/helpers/search_helper.rb' - - 'ee/app/graphql/ee/types/issue_connection_type.rb' - - 'ee/app/models/search/namespace_index_assignment.rb' - - 'lib/api/projects.rb' - - 'lib/sidebars/projects/menus/infrastructure_menu.rb' - - 'spec/lib/gitlab/redis/multi_store_spec.rb' diff --git a/app/controllers/import/base_controller.rb b/app/controllers/import/base_controller.rb index f3a0ce64839c2db0a75806e7a8a4d8fe2d772d28..91ee1cd1db2da2daa0721f1351607e3843707a93 100644 --- a/app/controllers/import/base_controller.rb +++ b/app/controllers/import/base_controller.rb @@ -15,7 +15,7 @@ def status incompatible_repos: serialized_incompatible_repos } end format.html do - if params[:namespace_id]&.present? + if params[:namespace_id].present? @namespace = Namespace.find_by_id(params[:namespace_id]) render_404 unless current_user.can?(:import_projects, @namespace) diff --git a/app/graphql/resolvers/users_resolver.rb b/app/graphql/resolvers/users_resolver.rb index a512c6bafe13837eaedc24aa14017197e9c39619..f795169e33bb52f8ab3df17371ca6e6312a5953c 100644 --- a/app/graphql/resolvers/users_resolver.rb +++ b/app/graphql/resolvers/users_resolver.rb @@ -48,7 +48,7 @@ def ready?(**args) return super if args.values.compact.blank? - if args[:usernames]&.present? && args[:ids]&.present? + if args[:usernames].present? && args[:ids].present? raise Gitlab::Graphql::Errors::ArgumentError, 'Provide either a list of usernames or ids' end diff --git a/app/graphql/types/countable_connection_type.rb b/app/graphql/types/countable_connection_type.rb index 4c216ceceb6a16bcf0f0a9e6c1ea6d00a9d8f152..ad0644a9d16948fc6998ea21dd3de35bcafc2f07 100644 --- a/app/graphql/types/countable_connection_type.rb +++ b/app/graphql/types/countable_connection_type.rb @@ -14,7 +14,7 @@ def count relation = relation.reorder(nil) if relation.respond_to?(:reorder) # rubocop: enable CodeReuse/ActiveRecord - if relation.try(:group_values)&.present? + if relation.try(:group_values).present? relation.size.keys.size else relation.size diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 3c444aee6443ee71527d59f5841b5f772c3b22b3..66c36d631c3c425dacf0a2adcfc1dc3496c75226 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -204,11 +204,11 @@ def search_group end def search_has_group? - search_group&.present? && search_group&.persisted? + search_group.present? && search_group&.persisted? end def search_has_project? - @project&.present? && @project&.persisted? + @project.present? && @project&.persisted? end def header_search_context @@ -228,7 +228,7 @@ def header_search_context end hash[:scope] = search_scope if search_has_project? || search_has_group? - hash[:for_snippets] = @snippet&.present? || @snippets&.any? + hash[:for_snippets] = @snippet.present? || @snippets&.any? end end diff --git a/ee/app/graphql/ee/types/issue_connection_type.rb b/ee/app/graphql/ee/types/issue_connection_type.rb index 730c1c44db8011b0f881af499836813e1b93abfd..f13d1214c406cabcab7bca94be1845575d39df1b 100644 --- a/ee/app/graphql/ee/types/issue_connection_type.rb +++ b/ee/app/graphql/ee/types/issue_connection_type.rb @@ -18,7 +18,7 @@ def weight result = relation.sum(:weight) - if relation.try(:group_values)&.present? + if relation.try(:group_values).present? result.values.sum else result diff --git a/ee/app/models/search/namespace_index_assignment.rb b/ee/app/models/search/namespace_index_assignment.rb index 82540502e1add0c627de70012ec61ac50d5fb1b3..96e280735387c554fde80d90f59ab354deb2c1c8 100644 --- a/ee/app/models/search/namespace_index_assignment.rb +++ b/ee/app/models/search/namespace_index_assignment.rb @@ -37,7 +37,7 @@ def set_namespace_id_non_nullable end def set_index_type - self.index_type = index&.type if index&.present? + self.index_type = index&.type if index.present? end def only_root_namespaces_can_be_indexed diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 3711a90ca0179ce8fb5bdf7ea9059bb2d2a5a788..2c270e7c36e5f2750855e4f47a12847ed2785733 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -228,7 +228,7 @@ def translate_params_for_compatibility(params) end def add_import_params(params) - params[:import_type] = 'git' if params[:import_url]&.present? + params[:import_type] = 'git' if params[:import_url].present? params end end diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb index 40a8b70b6241615f3fd4044ffa273fe3243f773e..448285fb773d6e5cd5471e01eefe9de4ff579df7 100644 --- a/lib/sidebars/projects/menus/infrastructure_menu.rb +++ b/lib/sidebars/projects/menus/infrastructure_menu.rb @@ -123,7 +123,7 @@ def google_cloud_menu_item def google_oauth2_configured? config = Gitlab::Auth::OAuth::Provider.config_for('google_oauth2') - config&.present? && config.app_id.present? && config.app_secret.present? + config.present? && config.app_id.present? && config.app_secret.present? end end end