diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-02-21 19:02:23 -0600 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:31:57 -0600 |
commit | 8a4d68c53e9c58ad7f8dce1494f7976292b2f929 (patch) | |
tree | 773814f7079c626cafabc229f929cafbe4d4b2e7 /app/controllers | |
parent | 7ea641b6d0882fc782a7eb493daf8b66d076924b (diff) | |
download | gitlab-ce-8a4d68c53e9c58ad7f8dce1494f7976292b2f929.tar.gz |
Enable Style/ConditionalAssignment
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/creates_commit.rb | 6 | ||||
-rw-r--r-- | app/controllers/projects/git_http_client_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/sessions_controller.rb | 6 |
4 files changed, 12 insertions, 12 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 |