summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/creates_commit.rb6
-rw-r--r--app/controllers/projects/git_http_client_controller.rb6
-rw-r--r--app/controllers/projects/merge_requests_controller.rb6
-rw-r--r--app/controllers/sessions_controller.rb6
-rw-r--r--app/finders/notes_finder.rb6
-rw-r--r--app/helpers/application_helper.rb6
-rw-r--r--app/helpers/blob_helper.rb6
-rw-r--r--app/mailers/repository_check_mailer.rb6
-rw-r--r--app/models/commit.rb6
-rw-r--r--app/models/concerns/case_sensitivity.rb6
-rw-r--r--app/models/concerns/sortable.rb6
-rw-r--r--app/models/network/graph.rb6
-rw-r--r--app/models/project.rb6
-rw-r--r--app/models/project_services/pushover_service.rb8
-rw-r--r--app/services/system_note_service.rb6
15 files changed, 46 insertions, 46 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index 88d180fcc2e..a6cf2b274a2 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -101,12 +101,12 @@ module CreatesCommit
# TODO: We should really clean this up
def set_commit_variables
- if can?(current_user, :push_code, @project)
+ @mr_source_project = if can?(current_user, :push_code, @project)
# Edit file in this project
- @mr_source_project = @project
+ @project
else
# Merge request from fork to this project
- @mr_source_project = current_user.fork_of(@project)
+ current_user.fork_of(@project)
end
# Merge request to this project
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb
index 216c158e41e..0305dafe8da 100644
--- a/app/controllers/projects/git_http_client_controller.rb
+++ b/app/controllers/projects/git_http_client_controller.rb
@@ -76,10 +76,10 @@ class Projects::GitHttpClientController < Projects::ApplicationController
return @project if defined?(@project)
project_id, _ = project_id_with_suffix
- if project_id.blank?
- @project = nil
+ @project = if project_id.blank?
+ nil
else
- @project = Project.find_by_full_path("#{params[:namespace_id]}/#{project_id}")
+ Project.find_by_full_path("#{params[:namespace_id]}/#{project_id}")
end
end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index c0c71c11dc2..ff77c2b5e01 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -381,13 +381,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def merge_widget_refresh
- if merge_request.merge_when_build_succeeds
- @status = :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
# 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
- @status = :success
+ :success
end
render 'merge'
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 93a180b9036..529a8c9b4b4 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -15,10 +15,10 @@ class SessionsController < Devise::SessionsController
def new
set_minimum_password_length
- if Gitlab.config.ldap.enabled
- @ldap_servers = Gitlab::LDAP::Config.servers
+ @ldap_servers = if Gitlab.config.ldap.enabled
+ Gitlab::LDAP::Config.servers
else
- @ldap_servers = []
+ []
end
super
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index 4bd8c83081a..3279cd4a941 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -28,10 +28,10 @@ class NotesFinder
private
def init_collection
- if @params[:target_id]
- @notes = on_target(@params[:target_type], @params[:target_id])
+ @notes = if @params[:target_id]
+ on_target(@params[:target_type], @params[:target_id])
else
- @notes = notes_of_any_type
+ notes_of_any_type
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6db813d4a02..ed4be180f04 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -69,10 +69,10 @@ module ApplicationHelper
end
def avatar_icon(user_or_email = nil, size = nil, scale = 2)
- if user_or_email.is_a?(User)
- user = user_or_email
+ user = if user_or_email.is_a?(User)
+ user_or_email
else
- user = User.find_by_any_email(user_or_email.try(:downcase))
+ User.find_by_any_email(user_or_email.try(:downcase))
end
if user
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 311a70725ab..6cba11f1b63 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -153,15 +153,15 @@ module BlobHelper
# Because we are opionated we set the cache headers ourselves.
response.cache_control[:public] = @project.public?
- 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.
- response.cache_control[:max_age] = Blob::CACHE_TIME_IMMUTABLE
+ Blob::CACHE_TIME_IMMUTABLE
else
# A branch or tag points at this blob. That means that the expected blob
# value may change over time.
- response.cache_control[:max_age] = Blob::CACHE_TIME
+ Blob::CACHE_TIME
end
response.etag = @blob.id
diff --git a/app/mailers/repository_check_mailer.rb b/app/mailers/repository_check_mailer.rb
index 21db2fe04a0..11a0c0b7700 100644
--- a/app/mailers/repository_check_mailer.rb
+++ b/app/mailers/repository_check_mailer.rb
@@ -1,9 +1,9 @@
class RepositoryCheckMailer < BaseMailer
def notify(failed_count)
- if failed_count == 1
- @message = "One project failed its last repository check"
+ @message = if failed_count == 1
+ "One project failed its last repository check"
else
- @message = "#{failed_count} projects failed their last repository check"
+ "#{failed_count} projects failed their last repository check"
end
mail(
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 7afc8f4add8..feb35bb3e92 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -122,10 +122,10 @@ class Commit
def full_title
return @full_title if @full_title
- if safe_message.blank?
- @full_title = no_commit_message
+ @full_title = if safe_message.blank?
+ no_commit_message
else
- @full_title = safe_message.split("\n", 2).first
+ safe_message.split("\n", 2).first
end
end
diff --git a/app/models/concerns/case_sensitivity.rb b/app/models/concerns/case_sensitivity.rb
index fe0cea8465f..2cfb6127c96 100644
--- a/app/models/concerns/case_sensitivity.rb
+++ b/app/models/concerns/case_sensitivity.rb
@@ -13,10 +13,10 @@ module CaseSensitivity
params.each do |key, value|
column = ActiveRecord::Base.connection.quote_table_name(key)
- if cast_lower
- condition = "LOWER(#{column}) = LOWER(:value)"
+ condition = if cast_lower
+ "LOWER(#{column}) = LOWER(:value)"
else
- condition = "#{column} = :value"
+ "#{column} = :value"
end
criteria = criteria.where(condition, value: value)
diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index 7edb0acd56c..fdcb4f3ba64 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -46,10 +46,10 @@ module Sortable
where("label_links.target_id = #{target_column}").
reorder(nil)
- if target_type_column
- query = query.where("label_links.target_type = #{target_type_column}")
+ query = if target_type_column
+ query.where("label_links.target_type = #{target_type_column}")
else
- query = query.where(label_links: { target_type: target_type })
+ query.where(label_links: { target_type: target_type })
end
query = query.where.not(title: excluded_labels) if excluded_labels.present?
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index b16ecc424dd..b859d40da24 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -188,10 +188,10 @@ module Network
end
# and mark it as reserved
- if parent_time.nil?
- min_time = leaves.first.time
+ min_time = if parent_time.nil?
+ leaves.first.time
else
- min_time = parent_time + 1
+ parent_time + 1
end
max_time = leaves.last.time
diff --git a/app/models/project.rb b/app/models/project.rb
index 0da21be8351..a0bc82af7d5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -453,12 +453,12 @@ class Project < ActiveRecord::Base
end
def add_import_job
- if forked?
- job_id = RepositoryForkWorker.perform_async(id, forked_from_project.repository_storage_path,
+ 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
- job_id = RepositoryImportWorker.perform_async(self.id)
+ RepositoryImportWorker.perform_async(self.id)
end
if job_id
diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index f623bf9851b..cd185f6e120 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -72,12 +72,12 @@ class PushoverService < Service
before = data[:before]
after = data[:after]
- if Gitlab::Git.blank_ref?(before)
- message = "#{data[:user_name]} pushed new branch \"#{ref}\"."
+ message = if Gitlab::Git.blank_ref?(before)
+ "#{data[:user_name]} pushed new branch \"#{ref}\"."
elsif Gitlab::Git.blank_ref?(after)
- message = "#{data[:user_name]} deleted branch \"#{ref}\"."
+ "#{data[:user_name]} deleted branch \"#{ref}\"."
else
- message = "#{data[:user_name]} push to branch \"#{ref}\"."
+ "#{data[:user_name]} push to branch \"#{ref}\"."
end
if data[:total_commits_count] > 0
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 71b4f8605a4..3e362bb2ca9 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -408,11 +408,11 @@ module SystemNoteService
# Initial scope should be system notes of this noteable type
notes = Note.system.where(noteable_type: noteable.class)
- if noteable.is_a?(Commit)
+ notes = if noteable.is_a?(Commit)
# Commits have non-integer IDs, so they're stored in `commit_id`
- notes = notes.where(commit_id: noteable.id)
+ notes.where(commit_id: noteable.id)
else
- notes = notes.where(noteable_id: noteable.id)
+ notes.where(noteable_id: noteable.id)
end
notes_for_mentioner(mentioner, noteable, notes).exists?
View Lorry Controller Status