GitLab steht aufgrund wichtiger Wartungsarbeiten am Montag, den 8. März, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 5c7f9d69 authored by Douwe Maan's avatar Douwe Maan

Fix code for cops

parent 02494f7c
......@@ -101,13 +101,14 @@ def create_merge_request?
# TODO: We should really clean this up
def set_commit_variables
@mr_source_project = if can?(current_user, :push_code, @project)
# Edit file in this project
@project
else
# Merge request from fork to this project
current_user.fork_of(@project)
end
@mr_source_project =
if can?(current_user, :push_code, @project)
# Edit file in this project
@project
else
# Merge request from fork to this project
current_user.fork_of(@project)
end
# Merge request to this project
@mr_target_project = @project
......
......@@ -76,11 +76,12 @@ def project
return @project if defined?(@project)
project_id, _ = project_id_with_suffix
@project = if project_id.blank?
nil
else
Project.find_by_full_path("#{params[:namespace_id]}/#{project_id}")
end
@project =
if project_id.blank?
nil
else
Project.find_by_full_path("#{params[:namespace_id]}/#{project_id}")
end
end
# This method returns two values so that we can parse
......
......@@ -381,14 +381,15 @@ def merge
end
def merge_widget_refresh
@status = if merge_request.merge_when_build_succeeds
:merge_when_build_succeeds
else
# Only MRs that can be merged end in this action
# MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
# in last case it does not have any special status. Possible error is handled inside widget js function
:success
end
@status =
if merge_request.merge_when_build_succeeds
:merge_when_build_succeeds
else
# Only MRs that can be merged end in this action
# MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
# in last case it does not have any special status. Possible error is handled inside widget js function
:success
end
render 'merge'
end
......
......@@ -15,11 +15,12 @@ class SessionsController < Devise::SessionsController
def new
set_minimum_password_length
@ldap_servers = if Gitlab.config.ldap.enabled
Gitlab::LDAP::Config.servers
else
[]
end
@ldap_servers =
if Gitlab.config.ldap.enabled
Gitlab::LDAP::Config.servers
else
[]
end
super
end
......
......@@ -28,11 +28,12 @@ def execute
private
def init_collection
@notes = if @params[:target_id]
on_target(@params[:target_type], @params[:target_id])
else
notes_of_any_type
end
@notes =
if @params[:target_id]
on_target(@params[:target_type], @params[:target_id])
else
notes_of_any_type
end
end
def notes_of_any_type
......
......@@ -69,11 +69,12 @@ def project_identicon(project, options = {})
end
def avatar_icon(user_or_email = nil, size = nil, scale = 2)
user = if user_or_email.is_a?(User)
user_or_email
else
User.find_by_any_email(user_or_email.try(:downcase))
end
user =
if user_or_email.is_a?(User)
user_or_email
else
User.find_by_any_email(user_or_email.try(:downcase))
end
if user
user.avatar_url(size) || default_avatar
......
......@@ -153,16 +153,17 @@ def cached_blob?
# 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
# 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.
Blob::CACHE_TIME_IMMUTABLE
else
# A branch or tag points at this blob. That means that the expected blob
# value may change over time.
Blob::CACHE_TIME
end
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.
Blob::CACHE_TIME_IMMUTABLE
else
# A branch or tag points at this blob. That means that the expected blob
# value may change over time.
Blob::CACHE_TIME
end
response.etag = @blob.id
!stale
......
......@@ -38,7 +38,7 @@ def gitlab_dot_com_url?(url)
def self_url?(url, namespace, project)
return true if url == [Gitlab.config.gitlab.url, '/', namespace, '/',
project, '.git'].join('')
project, '.git'].join('')
url == gitlab_shell.url_to_repo([namespace, '/', project].join(''))
end
......
class RepositoryCheckMailer < BaseMailer
def notify(failed_count)
@message = if failed_count == 1
"One project failed its last repository check"
else
"#{failed_count} projects failed their last repository check"
end
@message =
if failed_count == 1
"One project failed its last repository check"
else
"#{failed_count} projects failed their last repository check"
end
mail(
to: User.admins.pluck(:email),
......
......@@ -122,11 +122,12 @@ def title
def full_title
return @full_title if @full_title
@full_title = if safe_message.blank?
no_commit_message
else
safe_message.split("\n", 2).first
end
@full_title =
if safe_message.blank?
no_commit_message
else
safe_message.split("\n", 2).first
end
end
# Returns the commits description
......
......@@ -13,11 +13,12 @@ def iwhere(params)
params.each do |key, value|
column = ActiveRecord::Base.connection.quote_table_name(key)
condition = if cast_lower
"LOWER(#{column}) = LOWER(:value)"
else
"#{column} = :value"
end
condition =
if cast_lower
"LOWER(#{column}) = LOWER(:value)"
else
"#{column} = :value"
end
criteria = criteria.where(condition, value: value)
end
......
......@@ -46,11 +46,12 @@ def highest_label_priority(target_type_column: nil, target_type: nil, target_col
where("label_links.target_id = #{target_column}").
reorder(nil)
query = if target_type_column
query.where("label_links.target_type = #{target_type_column}")
else
query.where(label_links: { target_type: target_type })
end
query =
if target_type_column
query.where("label_links.target_type = #{target_type_column}")
else
query.where(label_links: { target_type: target_type })
end
query = query.where.not(title: excluded_labels) if excluded_labels.present?
......
......@@ -188,11 +188,12 @@ def place_chain(commit, parent_time = nil)
end
# and mark it as reserved
min_time = if parent_time.nil?
leaves.first.time
else
parent_time + 1
end
min_time =
if parent_time.nil?
leaves.first.time
else
parent_time + 1
end
max_time = leaves.last.time
leaves.last.parents(@map).each do |parent|
......
......@@ -453,13 +453,14 @@ def saved?
end
def add_import_job
job_id = if forked?
RepositoryForkWorker.perform_async(id, forked_from_project.repository_storage_path,
forked_from_project.path_with_namespace,
self.namespace.full_path)
else
RepositoryImportWorker.perform_async(self.id)
end
job_id =
if forked?
RepositoryForkWorker.perform_async(id, forked_from_project.repository_storage_path,
forked_from_project.path_with_namespace,
self.namespace.full_path)
else
RepositoryImportWorker.perform_async(self.id)
end
if job_id
Rails.logger.info "Import job started for #{path_with_namespace} with job ID #{job_id}"
......
......@@ -72,13 +72,14 @@ def execute(data)
before = data[:before]
after = data[:after]
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}\"."
else
"#{data[:user_name]} push to branch \"#{ref}\"."
end
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}\"."
else
"#{data[:user_name]} push to branch \"#{ref}\"."
end
if data[:total_commits_count] > 0
message << "\nTotal commits count: #{data[:total_commits_count]}"
......
......@@ -408,12 +408,13 @@ def cross_reference_exists?(noteable, mentioner)
# Initial scope should be system notes of this noteable type
notes = Note.system.where(noteable_type: noteable.class)
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
notes.where(noteable_id: noteable.id)
end
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
notes.where(noteable_id: noteable.id)
end
notes_for_mentioner(mentioner, noteable, notes).exists?
end
......
......@@ -14,16 +14,17 @@ def host_without_www(url)
end
def build_gitlab_ci_url
custom_port = if on_standard_port?(gitlab)
nil
else
":#{gitlab.port}"
end
custom_port =
if on_standard_port?(gitlab)
nil
else
":#{gitlab.port}"
end
[gitlab.protocol,
"://",
gitlab.host,
custom_port,
gitlab.relative_url_root
"://",
gitlab.host,
custom_port,
gitlab.relative_url_root
].join('')
end
......@@ -81,9 +82,9 @@ def verify_constant(modul, current, default)
def base_url(config)
custom_port = on_standard_port?(config) ? nil : ":#{config.port}"
[config.protocol,
"://",
config.host,
custom_port
"://",
config.host,
custom_port
]
end
......@@ -160,15 +161,16 @@ def host(url)
github_settings["args"] ||= Settingslogic.new({})
github_settings["args"]["client_options"] = if github_settings["url"].include?(github_default_url)
OmniAuth::Strategies::GitHub.default_options[:client_options]
else
{
"site" => File.join(github_settings["url"], "api/v3"),
"authorize_url" => File.join(github_settings["url"], "login/oauth/authorize"),
"token_url" => File.join(github_settings["url"], "login/oauth/access_token")
}
end
github_settings["args"]["client_options"] =
if github_settings["url"].include?(github_default_url)
OmniAuth::Strategies::GitHub.default_options[:client_options]
else
{
"site" => File.join(github_settings["url"], "api/v3"),
"authorize_url" => File.join(github_settings["url"], "login/oauth/authorize"),
"token_url" => File.join(github_settings["url"], "login/oauth/access_token")
}
end
end
Settings['shared'] ||= Settingslogic.new({})
......
......@@ -115,7 +115,7 @@ module ClassMethods
def install_error_responders(base)
error_classes = [MissingTokenError, TokenNotFoundError,
ExpiredError, RevokedError, InsufficientScopeError]
ExpiredError, RevokedError, InsufficientScopeError]
base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
end
......
......@@ -16,7 +16,7 @@ class AwardEmoji < Grape::API
end
[":id/#{awardable_string}/:#{awardable_id_string}/award_emoji",
":id/#{awardable_string}/:#{awardable_id_string}/notes/:note_id/award_emoji"
":id/#{awardable_string}/:#{awardable_id_string}/notes/:note_id/award_emoji"
].each do |endpoint|
desc 'Get a list of project +awardable+ award emoji' do
......
......@@ -160,11 +160,12 @@ def object_link_filter(text, pattern, link_content: nil)
data = data_attributes_for(link_content || match, project, object, link: !!link_content)
url = if matches.names.include?("url") && matches[:url]
matches[:url]
else
url_for_object_cached(object, project)
end
url =
if matches.names.include?("url") && matches[:url]
matches[:url]
else
url_for_object_cached(object, project)
end
content = link_content || object_link_text(object, matches)
......
......@@ -149,11 +149,12 @@ def process_page_link_tag(parts)
name, reference = *parts.compact.map(&:strip)
end
href = if url?(reference)
reference
else
::File.join(project_wiki_base_path, reference)
end
href =
if url?(reference)
reference
else
::File.join(project_wiki_base_path, reference)
end
content_tag(:a, name || reference, href: href, class: 'gfm')
end
......
......@@ -39,11 +39,12 @@ def issues_per_project
projects_per_reference.each do |path, project|
issue_ids = references_per_project[path]
issues = if project.default_issues_tracker?
project.issues.where(iid: issue_ids.to_a)
else
issue_ids.map { |id| ExternalIssue.new(id, project) }
end
issues =
if project.default_issues_tracker?
project.issues.where(iid: issue_ids.to_a)
else
issue_ids.map { |id| ExternalIssue.new(id, project) }
end
issues.each do |issue|
hash[project][issue.iid.to_i] = issue
......
......@@ -69,11 +69,12 @@ def self.urls
end
JSON.parse(File.read(path)).map do |hash|
fname = if digest
"#{hash['unicode']}-#{hash['digest']}"
else
hash['unicode']
end
fname =
if digest
"#{hash['unicode']}-#{hash['digest']}"
else
hash['unicode']
end
{ name: hash['name'], path: File.join(base, prefix, "#{fname}.png") }
end
......
......@@ -49,7 +49,7 @@ def compose_jobs!
factory = Entry::Factory.new(Entry::Jobs).
value(@config.except(*self.class.nodes.keys)).
with(key: :jobs, parent: self,
description: 'Jobs definition for this pipeline')
description: 'Jobs definition for this pipeline')
@entries[:jobs] = factory.create!
end
......
......@@ -35,7 +35,7 @@ def compose!(deps = nil)
value(config || {}).
metadata(name: name).
with(key: name, parent: self,
description: "#{name} job definition.")
description: "#{name} job definition.")
@entries[name] = factory.create!
end
......
......@@ -91,11 +91,12 @@ def highlight_lines!
our_highlight = Gitlab::Highlight.highlight(our_path, our_file, repository: repository).lines
lines.each do |line|
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)
end
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)
end
end
end
......
......@@ -140,15 +140,16 @@ def line_code(repository)
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)
Gitlab::Git::Commit.find(repository.raw_repository, head_sha)
else
Gitlab::Git::Compare.new(
repository.raw_repository,
start_sha,
head_sha
)
end
compare =
if Gitlab::Git.blank_ref?(start_sha)
Gitlab::Git::Commit.find(repository.raw_repository, head_sha)
else
Gitlab::Git::Compare.new(
repository.raw_repository,
start_sha,
head_sha
)
end
diff = compare.diffs(paths: paths).first
......
......@@ -31,11 +31,12 @@ def execute
private
def select_body(message)
part = if message.multipart?
message.text_part || message.html_part || message
else
message
end
part =
if message.multipart?
message.text_part || message.html_part || message
else
message
end
decoded = fix_charset(part)
......
......@@ -143,11 +143,12 @@ def self.instrument(type, mod, name)
# 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
''
else
'*args'
end
args_signature =
if method.arity == 0
''
else
'*args'
end
proxy_module.class_eval <<-EOF, __FILE__, __LINE__ + 1
def #{name}(#{args_signature})
......
......@@ -28,11 +28,12 @@ def gl_user
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?
false
else
true
end
@user.external =
if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
false
else
true
end
end
@user
......
......@@ -56,11 +56,12 @@ def projects
def issues
issues = IssuesFinder.new(current_user).execute.where(project_id: project_ids_relation)
issues = if query =~ /#(\d+)\z/
issues.where(iid: $1)
else
issues.full_search(query)
end
issues =
if query =~ /#(\d+)\z/
issues.where(iid: $1)
else
issues.full_search(query)
end