Commit 181cd299 authored by Jacopo's avatar Jacopo
Browse files

Adds Rubocop rule for line break after guard clause

Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
parent 2cd12647e3a6
......@@ -97,6 +97,7 @@ def append_info_to_payload(payload)
# (e.g. tokens) to authenticate the user, whereas Devise sets current_user
def auth_user
return current_user if current_user.present?
return try(:authenticated_user)
end
......
......@@ -44,6 +44,7 @@ def load_group
if @project.blank? && params[:group_id].present?
group = Group.find(params[:group_id])
return render_404 unless can?(current_user, :read_group, group)
group
end
end
......@@ -54,6 +55,7 @@ def load_project
if params[:project_id].present?
project = Project.find(params[:project_id])
return render_404 unless can?(current_user, :read_project, project)
project
end
end
......
......@@ -4,6 +4,7 @@ class Import::GitlabProjectsController < Import::BaseController
def new
@namespace = Namespace.find(project_params[:namespace_id])
return render_404 unless current_user.can?(:create_projects, @namespace)
@path = project_params[:path]
end
......
......@@ -12,6 +12,7 @@ def index
def metrics
return render_404 unless deployment.has_metrics?
@metrics = deployment.metrics
if @metrics&.any?
render json: @metrics, status: :ok
......
......@@ -12,6 +12,7 @@ def create
if group
return render_404 unless can?(current_user, :read_group, group)
Projects::GroupLinks::CreateService.new(project, current_user, group_link_create_params).execute(group)
else
flash[:alert] = 'Please select a group.'
......
......@@ -171,6 +171,7 @@ def create_merge_request
def issue
return @issue if defined?(@issue)
# The Sortable default scope causes performance issues when used with find_by
@issuable = @noteable = @issue ||= @project.issues.where(iid: params[:id]).reorder(nil).take!
@note = @project.notes.new(noteable: @issuable)
......
......@@ -111,6 +111,7 @@ def promote
begin
return render_404 unless promote_service.execute(@label)
respond_to do |format|
format.html do
redirect_to(project_labels_path(@project),
......
......@@ -54,6 +54,7 @@ def tmp_filename
name = request.headers['X-Gitlab-Lfs-Tmp']
return if name.include?('/')
return unless oid.present? && name.start_with?(oid)
name
end
......
......@@ -76,6 +76,7 @@ def authorize_resolve_note!
def authorize_create_note!
return unless noteable.lockable?
access_denied! unless can?(current_user, :create_note, noteable)
end
end
......@@ -28,6 +28,7 @@ def show
)
else
return render('empty') unless can?(current_user, :create_wiki, @project)
@page = WikiPage.new(@project_wiki)
@page.title = params[:id]
......
......@@ -269,6 +269,7 @@ def refs
def render_landing_page
if can?(current_user, :download_code, @project)
return render 'projects/no_repo' unless @project.repository_exists?
render 'projects/empty' if @project.empty_repo?
else
if @project.wiki_enabled?
......
......@@ -18,6 +18,7 @@ def execute
def by_user(tokens)
return tokens unless @params[:user]
tokens.where(user: @params[:user])
end
......
......@@ -111,6 +111,7 @@ def diff_file_blob_raw_path(diff_file)
def diff_file_old_blob_raw_path(diff_file)
sha = diff_file.old_content_sha
return unless sha
project_raw_path(@project, tree_join(diff_file.old_content_sha, diff_file.old_path))
end
......
......@@ -24,6 +24,7 @@ def email_action(url)
def action_title(url)
return unless url
%w(merge_requests issues commit).each do |action|
if url.split("/").include?(action)
return "View #{action.humanize.singularize}"
......
......@@ -53,6 +53,7 @@ def link_to_html(redacted, url, html_options = {})
# text, wrapping anything found in the requested link
fragment.children.each do |node|
next unless node.text?
node.replace(link_to(node.text, url, html_options))
end
end
......
......@@ -78,6 +78,7 @@ def notifications_menu_identifier(type, notification_setting)
# Create hidden field to send notification setting source to controller
def hidden_setting_source_input(notification_setting)
return unless notification_setting.source_type
hidden_field_tag "#{notification_setting.source_type.downcase}_id", notification_setting.source_id
end
......
......@@ -88,6 +88,7 @@ def path_breadcrumbs(max_links = 6)
part_path = part if part_path.empty?
next if parts.count > max_links && !parts.last(2).include?(part)
yield(part, part_path)
end
end
......
......@@ -150,6 +150,7 @@ def visibility_level_label(level)
def restricted_visibility_levels(show_all = false)
return [] if current_user.admin? && !show_all
current_application_settings.restricted_visibility_levels || []
end
......@@ -159,6 +160,7 @@ def restricted_visibility_levels(show_all = false)
def disallowed_visibility_level?(form_model, level)
return false unless form_model.respond_to?(:visibility_level_allowed?)
!form_model.visibility_level_allowed?(level)
end
......
......@@ -317,6 +317,7 @@ def stuck?
def execute_hooks
return unless project
build_data = Gitlab::DataBuilder::Build.build(self)
project.execute_hooks(build_data.dup, :job_hooks)
project.execute_services(build_data.dup, :job_hooks)
......
......@@ -300,8 +300,10 @@ def mark_as_processable_after_stage(stage_idx)
def latest?
return false unless ref
commit = project.commit(ref)
return false unless commit
commit.sha == sha
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment