Skip to content
Snippets Groups Projects
Commit 466c8f40 authored by Jonston Chan's avatar Jonston Chan
Browse files

Fix Style/EmptyElse Cop

Fixes auto-correctable RuboCop offenses for Style/EmptyElse in excludes

Changelog: other
parent 9b93a05a
No related branches found
No related tags found
2 merge requests!122597doc/gitaly: Remove references to removed metrics,!118423Fix auto-correctable `Style/EmptyElse` Cop
Showing
with 0 additions and 69 deletions
......@@ -2,54 +2,27 @@
# Cop supports --autocorrect.
Style/EmptyElse:
Exclude:
- 'app/controllers/concerns/issuable_collections_action.rb'
- 'app/controllers/concerns/sends_blob.rb'
- 'app/controllers/google_api/authorizations_controller.rb'
- 'app/controllers/projects_controller.rb'
- 'app/finders/group_finder.rb'
- 'app/finders/merge_requests_finder/params.rb'
- 'app/finders/snippets_finder.rb'
- 'app/graphql/mutations/concerns/mutations/spam_protection.rb'
- 'app/graphql/resolvers/group_milestones_resolver.rb'
- 'app/graphql/types/ci/detailed_status_type.rb'
- 'app/graphql/types/packages/package_base_type.rb'
- 'app/graphql/types/packages/package_file_type.rb'
- 'app/helpers/submodule_helper.rb'
- 'app/models/commit.rb'
- 'app/models/legacy_diff_discussion.rb'
- 'app/models/note.rb'
- 'app/models/performance_monitoring/prometheus_dashboard.rb'
- 'app/models/repository.rb'
- 'app/models/resource_state_event.rb'
- 'app/models/resource_timebox_event.rb'
- 'app/services/award_emojis/add_service.rb'
- 'app/services/merge_requests/update_service.rb'
- 'app/workers/post_receive.rb'
- 'config/initializers/doorkeeper_openid_connect.rb'
- 'ee/app/controllers/admin/audit_logs_controller.rb'
- 'ee/app/controllers/ee/groups_controller.rb'
- 'ee/app/helpers/ee/kerberos_helper.rb'
- 'ee/app/models/ee/audit_event.rb'
- 'ee/app/services/ee/users/update_service.rb'
- 'ee/app/services/epics/tree_reorder_service.rb'
- 'ee/app/services/gitlab_subscriptions/check_future_renewal_service.rb'
- 'ee/app/services/projects/update_mirror_service.rb'
- 'ee/lib/elastic/latest/note_instance_proxy.rb'
- 'ee/lib/gitlab/analytics/cycle_analytics/summary/change_failure_rate.rb'
- 'ee/lib/gitlab/geo/oauth/logout_token.rb'
- 'lib/api/subscriptions.rb'
- 'lib/gitlab/auth/o_auth/provider.rb'
- 'lib/gitlab/ci/variables/collection.rb'
- 'lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb'
- 'lib/gitlab/database/sha256_attribute.rb'
- 'lib/gitlab/diff/parser.rb'
- 'lib/gitlab/git.rb'
- 'lib/gitlab/git/ref.rb'
- 'lib/gitlab/git/tag.rb'
- 'lib/gitlab/pagination/keyset/paginator.rb'
- 'lib/gitlab/sidekiq_daemon/monitor.rb'
- 'lib/gitlab/x509/signature.rb'
- 'lib/peek/views/external_http.rb'
- 'qa/qa/support/loglinking.rb'
- 'spec/support/helpers/api_internal_base_helpers.rb'
- 'spec/support/shared_examples/requests/api/snippets_shared_examples.rb'
......@@ -48,8 +48,6 @@ def sorting_field
Issue::SORTING_PREFERENCE_FIELD
when 'merge_requests'
MergeRequest::SORTING_PREFERENCE_FIELD
else
nil
end
end
......@@ -59,8 +57,6 @@ def finder_type
IssuesFinder
when 'merge_requests'
MergeRequestsFinder
else
nil
end
end
......
......@@ -82,8 +82,6 @@ def new
@current_user_group =
if current_user.manageable_groups(include_groups_with_developer_maintainer_access: true).count == 1
current_user.manageable_groups(include_groups_with_developer_maintainer_access: true).first
else
nil
end
@project = Project.new(namespace_id: @namespace&.id)
......
......@@ -16,8 +16,6 @@ def reviewer
User.find_by_id(params[:reviewer_id])
elsif reviewer_username?
User.find_by_username(params[:reviewer_username])
else
nil
end
end
end
......
......@@ -179,8 +179,6 @@ def visibility_from_scope
Snippet::INTERNAL
when 'are_public'
Snippet::PUBLIC
else
nil
end
end
......
......@@ -26,8 +26,6 @@ def check_spam_action_response!(object)
elsif fields[:needs_captcha_response]
fields.delete :spam
raise NeedsCaptchaResponseError.new(NEEDS_CAPTCHA_RESPONSE_MESSAGE, extensions: fields)
else
nil
end
end
end
......
......@@ -52,8 +52,6 @@ def metadata
object.nuget_metadatum
when 'pypi'
object.pypi_metadatum
else
nil
end
end
# rubocop: enable GraphQL/ResolverMethodLength
......
......@@ -29,8 +29,6 @@ def file_metadata
object.conan_file_metadatum
when 'helm'
object.helm_file_metadatum
else
nil
end
end
end
......
......@@ -151,8 +151,6 @@ def sanitize_submodule_url(url)
if uri.scheme.in?(VALID_SUBMODULE_PROTOCOLS)
uri.to_s
else
nil
end
rescue URI::InvalidURIError
nil
......
......@@ -388,8 +388,6 @@ def signature
Gitlab::X509::Commit.new(self).signature
when :SSH
Gitlab::Ssh::Commit.new(self).signature
else
nil
end
end
end
......
......@@ -400,8 +400,6 @@ def merge_requests
project.merge_requests.by_commit_sha(commit_id)
elsif for_merge_request?
MergeRequest.id_in(noteable_id)
else
nil
end
end
......
......@@ -710,8 +710,6 @@ def blob_at_branch(branch_name, path)
if last_commit
blob_at(last_commit.sha, path)
else
nil
end
end
......@@ -966,8 +964,6 @@ def merged_to_root_ref?(branch_or_name)
same_head = branch.target == root_ref_sha
merged = ancestor?(branch.target, root_ref_sha)
!same_head && merged
else
nil
end
end
......
......@@ -262,8 +262,6 @@ def attempt_specialized_update_services(merge_request, attribute)
assignees_service.execute(merge_request)
when :spend_time
add_time_spent_service.execute(merge_request)
else
nil
end
end
......
......@@ -32,8 +32,6 @@ def index
Project.find_by_id(audit_events_params[:entity_id])
when 'Group'
Namespace.find_by_id(audit_events_params[:entity_id])
else
nil
end
Gitlab::Tracking.event(self.class.name, 'search_audit_event', user: current_user)
......
......@@ -125,8 +125,6 @@ def redirect_show_path
case group_view
when 'security_dashboard'
helpers.group_security_dashboard_path(group)
else
nil
end
end
end
......
......@@ -38,8 +38,6 @@ def root_group_entity
# Project events should be sent to the root ancestor's streaming destinations
# Projects without a group root ancestor should be ignored.
entity.group&.root_ancestor
else
nil
end
self.root_group_entity_id = root_group_entity&.id
......
......@@ -85,8 +85,6 @@ def saml_provider_id
if group_id_for_saml.present?
group = GroupFinder.new(current_user).execute(id: group_id_for_saml)
group&.saml_provider&.id
else
nil
end
end
end
......
......@@ -39,8 +39,6 @@ def token
if decoded_token&.is_utf8?
Doorkeeper::AccessToken.by_token(decoded_token)
else
nil
end
end
end
......
......@@ -87,8 +87,6 @@ def parent_resource(source_type)
case source_type
when 'project'
user_project
else
nil
end
end
end
......
......@@ -84,8 +84,6 @@ def identification_type(line)
"new"
when "-"
"old"
else
nil
end
end
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment