Read about our upcoming Code of Conduct on this issue

Commit 2b075f16 authored by Guilherme Garnier's avatar Guilherme Garnier
Browse files

Fix rubocop warnings in app

parent c2c97eb57cd0
...@@ -18,7 +18,7 @@ def create ...@@ -18,7 +18,7 @@ def create
rescue Ci::GitlabCiYamlProcessor::ValidationError => e rescue Ci::GitlabCiYamlProcessor::ValidationError => e
@error = e.message @error = e.message
@status = false @status = false
rescue Exception => e rescue Exception
@error = "Undefined error" @error = "Undefined error"
@status = false @status = false
end end
......
...@@ -71,7 +71,7 @@ def handle_omniauth ...@@ -71,7 +71,7 @@ def handle_omniauth
redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
end end
end end
rescue Gitlab::OAuth::SignupDisabledError => e rescue Gitlab::OAuth::SignupDisabledError
label = Gitlab::OAuth::Provider.label_for(oauth['provider']) label = Gitlab::OAuth::Provider.label_for(oauth['provider'])
message = "Signing in using your #{label} account without a pre-existing GitLab account is not allowed." message = "Signing in using your #{label} account without a pre-existing GitLab account is not allowed."
...@@ -80,7 +80,7 @@ def handle_omniauth ...@@ -80,7 +80,7 @@ def handle_omniauth
end end
flash[:notice] = message flash[:notice] = message
redirect_to new_user_session_path redirect_to new_user_session_path
end end
......
...@@ -98,7 +98,7 @@ def load_project_wiki ...@@ -98,7 +98,7 @@ def load_project_wiki
# Call #wiki to make sure the Wiki Repo is initialized # Call #wiki to make sure the Wiki Repo is initialized
@project_wiki.wiki @project_wiki.wiki
rescue ProjectWiki::CouldNotCreateWikiError => ex rescue ProjectWiki::CouldNotCreateWikiError
flash[:notice] = "Could not create Wiki Repository at this time. Please try again later." flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
redirect_to project_path(@project) redirect_to project_path(@project)
return false return false
......
...@@ -39,7 +39,7 @@ def execute ...@@ -39,7 +39,7 @@ def execute
items = by_assignee(items) items = by_assignee(items)
items = by_author(items) items = by_author(items)
items = by_label(items) items = by_label(items)
items = sort(items) sort(items)
end end
def group def group
......
...@@ -35,7 +35,7 @@ def current_action?(*args) ...@@ -35,7 +35,7 @@ def current_action?(*args)
def project_icon(project_id, options = {}) def project_icon(project_id, options = {})
project = project =
if project_id.is_a?(Project) if project_id.is_a?(Project)
project = project_id project_id
else else
Project.find_with_namespace(project_id) Project.find_with_namespace(project_id)
end end
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
module Ci module Ci
class Build < ActiveRecord::Base class Build < ActiveRecord::Base
extend Ci::Model extend Ci::Model
LAZY_ATTRIBUTES = ['trace'] LAZY_ATTRIBUTES = ['trace']
belongs_to :commit, class_name: 'Ci::Commit' belongs_to :commit, class_name: 'Ci::Commit'
...@@ -140,7 +140,7 @@ def retry(build) ...@@ -140,7 +140,7 @@ def retry(build)
def trace_html def trace_html
html = Ci::Ansi2html::convert(trace) if trace.present? html = Ci::Ansi2html::convert(trace) if trace.present?
html ||= '' html || ''
end end
def started? def started?
...@@ -211,7 +211,7 @@ def extract_coverage(text, regex) ...@@ -211,7 +211,7 @@ def extract_coverage(text, regex)
if coverage.present? if coverage.present?
coverage.to_f coverage.to_f
end end
rescue => ex rescue
# if bad regex or something goes wrong we dont want to interrupt transition # if bad regex or something goes wrong we dont want to interrupt transition
# so we just silentrly ignore error for now # so we just silentrly ignore error for now
end end
......
...@@ -184,7 +184,7 @@ def build_missing_services ...@@ -184,7 +184,7 @@ def build_missing_services
# If service is available but missing in db # If service is available but missing in db
# we should create an instance. Ex `create_gitlab_ci_service` # we should create an instance. Ex `create_gitlab_ci_service`
service = self.send :"create_#{service_name}_service" if service.nil? self.send :"create_#{service_name}_service" if service.nil?
end end
end end
......
...@@ -144,12 +144,10 @@ def reload_diffs ...@@ -144,12 +144,10 @@ def reload_diffs
# Collect array of Git::Diff objects # Collect array of Git::Diff objects
# between target and source branches # between target and source branches
def unmerged_diffs def unmerged_diffs
diffs = compare_result.diffs compare_result.diffs || []
diffs ||= [] rescue Gitlab::Git::Diff::TimeoutError
diffs
rescue Gitlab::Git::Diff::TimeoutError => ex
self.state = :timeout self.state = :timeout
diffs = [] []
end end
def repository def repository
......
...@@ -413,7 +413,7 @@ def build_missing_services ...@@ -413,7 +413,7 @@ def build_missing_services
if template.nil? if template.nil?
# If no template, we should create an instance. Ex `create_gitlab_ci_service` # If no template, we should create an instance. Ex `create_gitlab_ci_service`
service = self.send :"create_#{service_name}_service" self.send :"create_#{service_name}_service"
else else
Service.create_from_template(self.id, template) Service.create_from_template(self.id, template)
end end
...@@ -738,7 +738,7 @@ def repository_exists? ...@@ -738,7 +738,7 @@ def repository_exists?
def create_wiki def create_wiki
ProjectWiki.new(self, self.owner).wiki ProjectWiki.new(self, self.owner).wiki
true true
rescue ProjectWiki::CouldNotCreateWikiError => ex rescue ProjectWiki::CouldNotCreateWikiError
errors.add(:base, 'Failed create wiki') errors.add(:base, 'Failed create wiki')
false false
end end
......
...@@ -85,17 +85,16 @@ def message_options ...@@ -85,17 +85,16 @@ def message_options
def create_message(data) def create_message(data)
object_kind = data[:object_kind] object_kind = data[:object_kind]
message = \ case object_kind
case object_kind when "push", "tag_push"
when "push", "tag_push" create_push_message(data)
create_push_message(data) when "issue"
when "issue" create_issue_message(data) unless is_update?(data)
create_issue_message(data) unless is_update?(data) when "merge_request"
when "merge_request" create_merge_request_message(data) unless is_update?(data)
create_merge_request_message(data) unless is_update?(data) when "note"
when "note" create_note_message(data)
create_note_message(data) end
end
end end
def create_push_message(push) def create_push_message(push)
...@@ -167,8 +166,6 @@ def create_merge_request_message(data) ...@@ -167,8 +166,6 @@ def create_merge_request_message(data)
obj_attr = data[:object_attributes] obj_attr = data[:object_attributes]
obj_attr = HashWithIndifferentAccess.new(obj_attr) obj_attr = HashWithIndifferentAccess.new(obj_attr)
merge_request_id = obj_attr[:iid] merge_request_id = obj_attr[:iid]
source_branch = obj_attr[:source_branch]
target_branch = obj_attr[:target_branch]
state = obj_attr[:state] state = obj_attr[:state]
description = obj_attr[:description] description = obj_attr[:description]
title = obj_attr[:title] title = obj_attr[:title]
...@@ -194,8 +191,6 @@ def create_note_message(data) ...@@ -194,8 +191,6 @@ def create_note_message(data)
data = HashWithIndifferentAccess.new(data) data = HashWithIndifferentAccess.new(data)
user_name = data[:user][:name] user_name = data[:user][:name]
repo_attr = HashWithIndifferentAccess.new(data[:repository])
obj_attr = HashWithIndifferentAccess.new(data[:object_attributes]) obj_attr = HashWithIndifferentAccess.new(data[:object_attributes])
note = obj_attr[:note] note = obj_attr[:note]
note_url = obj_attr[:url] note_url = obj_attr[:url]
......
...@@ -549,7 +549,7 @@ def commit_with_hooks(current_user, branch) ...@@ -549,7 +549,7 @@ def commit_with_hooks(current_user, branch)
# Run GitLab post receive hook # Run GitLab post receive hook
post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo) post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo)
status = post_receive_hook.trigger(gl_id, oldrev, newrev, ref) post_receive_hook.trigger(gl_id, oldrev, newrev, ref)
else else
# Remove tmp ref and return error to user # Remove tmp ref and return error to user
rugged.references.delete(tmp_ref) rugged.references.delete(tmp_ref)
......
...@@ -701,13 +701,7 @@ def toggle_star(project) ...@@ -701,13 +701,7 @@ def toggle_star(project)
end end
def manageable_namespaces def manageable_namespaces
@manageable_namespaces ||= @manageable_namespaces ||= [namespace] + owned_groups + masters_groups
begin
namespaces = []
namespaces << namespace
namespaces += owned_groups
namespaces += masters_groups
end
end end
def namespaces def namespaces
......
...@@ -21,7 +21,7 @@ def execute ...@@ -21,7 +21,7 @@ def execute
create_target_branch create_target_branch
end end
if sha = commit if commit
success success
else else
error("Something went wrong. Your changes were not committed") error("Something went wrong. Your changes were not committed")
......
...@@ -62,7 +62,7 @@ def execute ...@@ -62,7 +62,7 @@ def execute
after_create_actions if @project.persisted? after_create_actions if @project.persisted?
@project @project
rescue => ex rescue
@project.errors.add(:base, "Can't save project. Please try again later") @project.errors.add(:base, "Can't save project. Please try again later")
@project @project
end 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