Commit 3a513471 authored by Douwe Maan's avatar Douwe Maan

Fix code for cops

parent 8dcc8574
......@@ -101,7 +101,8 @@ module CreatesCommit
# TODO: We should really clean this up
def set_commit_variables
@mr_source_project = if can?(current_user, :push_code, @project)
@mr_source_project =
if can?(current_user, :push_code, @project)
# Edit file in this project
@project
else
......
......@@ -76,7 +76,8 @@ class Projects::GitHttpClientController < Projects::ApplicationController
return @project if defined?(@project)
project_id, _ = project_id_with_suffix
@project = if project_id.blank?
@project =
if project_id.blank?
nil
else
Project.find_by_full_path("#{params[:namespace_id]}/#{project_id}")
......
......@@ -407,7 +407,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def merge_widget_refresh
@status = if merge_request.merge_when_build_succeeds
@status =
if merge_request.merge_when_build_succeeds
:merge_when_build_succeeds
else
# Only MRs that can be merged end in this action
......
......@@ -16,7 +16,8 @@ class SessionsController < Devise::SessionsController
def new
set_minimum_password_length
@ldap_servers = if Gitlab.config.ldap.enabled
@ldap_servers =
if Gitlab.config.ldap.enabled
Gitlab::LDAP::Config.servers
else
[]
......
......@@ -28,7 +28,8 @@ class NotesFinder
private
def init_collection
@notes = if @params[:target_id]
@notes =
if @params[:target_id]
on_target(@params[:target_type], @params[:target_id])
else
notes_of_any_type
......
......@@ -69,7 +69,8 @@ module ApplicationHelper
end
def avatar_icon(user_or_email = nil, size = nil, scale = 2)
user = if user_or_email.is_a?(User)
user =
if user_or_email.is_a?(User)
user_or_email
else
User.find_by_any_email(user_or_email.try(:downcase))
......
......@@ -153,7 +153,8 @@ module BlobHelper
# Because we are opionated we set the cache headers ourselves.
response.cache_control[:public] = @project.public?
response.cache_control[:max_age] = if @ref && @commit && @ref == @commit.id
response.cache_control[:max_age] =
if @ref && @commit && @ref == @commit.id
# This is a link to a commit by its commit SHA. That means that the blob
# is immutable. The only reason to invalidate the cache is if the commit
# was deleted or if the user lost access to the repository.
......
class RepositoryCheckMailer < BaseMailer
def notify(failed_count)
@message = if failed_count == 1
@message =
if failed_count == 1
"One project failed its last repository check"
else
"#{failed_count} projects failed their last repository check"
......
......@@ -122,7 +122,8 @@ class Commit
def full_title
return @full_title if @full_title
@full_title = if safe_message.blank?
@full_title =
if safe_message.blank?
no_commit_message
else
safe_message.split("\n", 2).first
......
......@@ -13,7 +13,8 @@ module CaseSensitivity
params.each do |key, value|
column = ActiveRecord::Base.connection.quote_table_name(key)
condition = if cast_lower
condition =
if cast_lower
"LOWER(#{column}) = LOWER(:value)"
else
"#{column} = :value"
......
......@@ -46,7 +46,8 @@ module Sortable
where("label_links.target_id = #{target_column}").
reorder(nil)
query = if target_type_column
query =
if target_type_column
query.where("label_links.target_type = #{target_type_column}")
else
query.where(label_links: { target_type: target_type })
......
......@@ -188,7 +188,8 @@ module Network
end
# and mark it as reserved
min_time = if parent_time.nil?
min_time =
if parent_time.nil?
leaves.first.time
else
parent_time + 1
......
......@@ -492,7 +492,8 @@ class Project < ActiveRecord::Base
end
def add_import_job
job_id = if forked?
job_id =
if forked?
RepositoryForkWorker.perform_async(id, forked_from_project.repository_storage_path,
forked_from_project.path_with_namespace,
self.namespace.full_path)
......
......@@ -72,7 +72,8 @@ class PushoverService < Service
before = data[:before]
after = data[:after]
message = if Gitlab::Git.blank_ref?(before)
message =
if Gitlab::Git.blank_ref?(before)
"#{data[:user_name]} pushed new branch \"#{ref}\"."
elsif Gitlab::Git.blank_ref?(after)
"#{data[:user_name]} deleted branch \"#{ref}\"."
......
......@@ -408,7 +408,8 @@ module SystemNoteService
# Initial scope should be system notes of this noteable type
notes = Note.system.where(noteable_type: noteable.class)
notes = if noteable.is_a?(Commit)
notes =
if noteable.is_a?(Commit)
# Commits have non-integer IDs, so they're stored in `commit_id`
notes.where(commit_id: noteable.id)
else
......
......@@ -15,7 +15,8 @@ class Settings < Settingslogic
end
def build_gitlab_ci_url
custom_port = if on_standard_port?(gitlab)
custom_port =
if on_standard_port?(gitlab)
nil
else
":#{gitlab.port}"
......@@ -201,7 +202,8 @@ if github_settings
github_settings["args"] ||= Settingslogic.new({})
github_settings["args"]["client_options"] = if github_settings["url"].include?(github_default_url)
github_settings["args"]["client_options"] =
if github_settings["url"].include?(github_default_url)
OmniAuth::Strategies::GitHub.default_options[:client_options]
else
{
......
......@@ -160,7 +160,8 @@ module Banzai
data = data_attributes_for(link_content || match, project, object, link: !!link_content)
url = if matches.names.include?("url") && matches[:url]
url =
if matches.names.include?("url") && matches[:url]
matches[:url]
else
url_for_object_cached(object, project)
......
......@@ -149,7 +149,8 @@ module Banzai
name, reference = *parts.compact.map(&:strip)
end
href = if url?(reference)
href =
if url?(reference)
reference
else
::File.join(project_wiki_base_path, reference)
......
......@@ -39,7 +39,8 @@ module Banzai
projects_per_reference.each do |path, project|
issue_ids = references_per_project[path]
issues = if project.default_issues_tracker?
issues =
if project.default_issues_tracker?
project.issues.where(iid: issue_ids.to_a)
else
issue_ids.map { |id| ExternalIssue.new(id, project) }
......
......@@ -69,7 +69,8 @@ module Gitlab
end
JSON.parse(File.read(path)).map do |hash|
fname = if digest
fname =
if digest
"#{hash['unicode']}-#{hash['digest']}"
else
hash['unicode']
......
......@@ -91,7 +91,8 @@ module Gitlab
our_highlight = Gitlab::Highlight.highlight(our_path, our_file, repository: repository).lines
lines.each do |line|
line.rich_text = if line.type == 'old'
line.rich_text =
if line.type == 'old'
their_highlight[line.old_line - 1].try(:html_safe)
else
our_highlight[line.new_line - 1].try(:html_safe)
......
......@@ -140,7 +140,8 @@ module Gitlab
def find_diff_file(repository)
# We're at the initial commit, so just get that as we can't compare to anything.
compare = if Gitlab::Git.blank_ref?(start_sha)
compare =
if Gitlab::Git.blank_ref?(start_sha)
Gitlab::Git::Commit.find(repository.raw_repository, head_sha)
else
Gitlab::Git::Compare.new(
......
......@@ -31,7 +31,8 @@ module Gitlab
private
def select_body(message)
part = if message.multipart?
part =
if message.multipart?
message.text_part || message.html_part || message
else
message
......
......@@ -143,7 +143,8 @@ module Gitlab
# signature this would break things. As a result we'll make sure the
# generated method _only_ accepts regular arguments if the underlying
# method also accepts them.
args_signature = if method.arity == 0
args_signature =
if method.arity == 0
''
else
'*args'
......
......@@ -28,7 +28,8 @@ module Gitlab
if external_users_enabled? && @user
# Check if there is overlap between the user's groups and the external groups
# setting then set user as external or internal.
@user.external = if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
@user.external =
if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
false
else
true
......
......@@ -56,7 +56,8 @@ module Gitlab
def issues
issues = IssuesFinder.new(current_user).execute.where(project_id: project_ids_relation)
issues = if query =~ /#(\d+)\z/
issues =
if query =~ /#(\d+)\z/
issues.where(iid: $1)
else
issues.full_search(query)
......@@ -73,7 +74,8 @@ module Gitlab
def merge_requests
merge_requests = MergeRequestsFinder.new(current_user).execute.in_projects(project_ids_relation)
merge_requests = if query =~ /[#!](\d+)\z/
merge_requests =
if query =~ /[#!](\d+)\z/
merge_requests.where(iid: $1)
else
merge_requests.full_search(query)
......
......@@ -94,7 +94,8 @@ module Gitlab
private
def raw_explain(query)
explain = if Gitlab::Database.postgresql?
explain =
if Gitlab::Database.postgresql?
"EXPLAIN ANALYZE #{query};"
else
"EXPLAIN #{query};"
......
......@@ -40,7 +40,8 @@ describe 'issuable list', feature: true do
def create_issuables(issuable_type)
3.times do
issuable = if issuable_type == :issue
issuable =
if issuable_type == :issue
create(:issue, project: project, author: user)
else
create(:merge_request, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name)
......
......@@ -3,7 +3,8 @@ shared_examples 'issuables list meta-data' do |issuable_type, action = nil|
@issuable_ids = []
2.times do
issuable = if issuable_type == :issue
issuable =
if issuable_type == :issue
create(issuable_type, project: project)
else
create(issuable_type, title: FFaker::Lorem.sentence, source_project: project, source_branch: FFaker::Name.name)
......
......@@ -15,7 +15,8 @@ module LoginHelpers
# user = create(:user)
# login_as(user)
def login_as(user_or_role)
@user = if user_or_role.kind_of?(User)
@user =
if user_or_role.kind_of?(User)
user_or_role
else
create(user_or_role)
......
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