summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2019-02-28 19:57:34 +0100
committerToon Claes <toon@gitlab.com>2019-02-28 19:57:34 +0100
commit62d7990b9bb30cf33ed87017c5c633d1cccc75c2 (patch)
treec3e1b69c58a412ba1c6f50a0337a23d9f9d6e1a4 /app/controllers/projects_controller.rb
parentf6453eca992a9c142268e78ac782cef98110d183 (diff)
downloadgitlab-ce-tc-standard-gem.tar.gz
Ran standardrb --fix on the whole codebasetc-standard-gem
Inspired by https://twitter.com/searls/status/1101137953743613952 I decided to try https://github.com/testdouble/standard on our codebase. It's opinionated, but at least it's a _standard_.
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb79
1 files changed, 39 insertions, 40 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 33c6608d321..0f346146e1d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -43,21 +43,21 @@ class ProjectsController < Projects::ApplicationController
def edit
@badge_api_endpoint = expose_url(api_v4_projects_badges_path(id: @project.id))
- render 'edit'
+ render "edit"
end
def create
@project = ::Projects::CreateService.new(current_user, project_params).execute
if @project.saved?
- cookies[:issue_board_welcome_hidden] = { path: project_path(@project), value: nil, expires: Time.at(0) }
+ cookies[:issue_board_welcome_hidden] = {path: project_path(@project), value: nil, expires: Time.at(0)}
redirect_to(
project_path(@project, custom_import_params),
- notice: _("Project '%{project_name}' was successfully created.") % { project_name: @project.name }
+ notice: _("Project '%{project_name}' was successfully created.") % {project_name: @project.name}
)
else
- render 'new', locals: { active_tab: active_new_project_tab }
+ render "new", locals: {active_tab: active_new_project_tab}
end
end
@@ -69,15 +69,15 @@ class ProjectsController < Projects::ApplicationController
respond_to do |format|
if result[:status] == :success
- flash[:notice] = _("Project '%{project_name}' was successfully updated.") % { project_name: @project.name }
+ flash[:notice] = _("Project '%{project_name}' was successfully updated.") % {project_name: @project.name}
format.html do
- redirect_to(edit_project_path(@project, anchor: 'js-general-project-settings'))
+ redirect_to(edit_project_path(@project, anchor: "js-general-project-settings"))
end
else
flash.now[:alert] = result[:message]
- format.html { render 'edit' }
+ format.html { render "edit" }
end
format.js
@@ -101,7 +101,7 @@ class ProjectsController < Projects::ApplicationController
return access_denied! unless can?(current_user, :remove_fork_project, @project)
if ::Projects::UnlinkForkService.new(@project, current_user).execute
- flash[:notice] = _('The fork relationship has been removed.')
+ flash[:notice] = _("The fork relationship has been removed.")
end
end
@@ -110,7 +110,7 @@ class ProjectsController < Projects::ApplicationController
format.html
format.json do
load_events
- pager_json('events/_events', @events.count)
+ pager_json("events/_events", @events.count)
end
end
end
@@ -122,7 +122,7 @@ class ProjectsController < Projects::ApplicationController
end
if @project.pending_delete?
- flash.now[:alert] = _("Project '%{project_name}' queued for deletion.") % { project_name: @project.name }
+ flash.now[:alert] = _("Project '%{project_name}' queued for deletion.") % {project_name: @project.name}
end
respond_to do |format|
@@ -135,7 +135,7 @@ class ProjectsController < Projects::ApplicationController
format.atom do
load_events
- render layout: 'xml.atom'
+ render layout: "xml.atom"
end
end
end
@@ -144,7 +144,7 @@ class ProjectsController < Projects::ApplicationController
return access_denied! unless can?(current_user, :remove_project, @project)
::Projects::DestroyService.new(@project, current_user, {}).async_execute
- flash[:notice] = _("Project '%{project_name}' is in the process of being deleted.") % { project_name: @project.full_name }
+ flash[:notice] = _("Project '%{project_name}' is in the process of being deleted.") % {project_name: @project.full_name}
redirect_to dashboard_projects_path, status: :found
rescue Projects::DestroyService::DestroyError => ex
@@ -155,7 +155,7 @@ class ProjectsController < Projects::ApplicationController
return render_404 unless Gitlab::IncomingEmail.supports_issue_creation?
current_user.reset_incoming_email_token!
- render json: { new_address: @project.new_issuable_address(current_user, params[:issuable_type]) }
+ render json: {new_address: @project.new_issuable_address(current_user, params[:issuable_type])}
end
def archive
@@ -187,7 +187,7 @@ class ProjectsController < Projects::ApplicationController
)
rescue ::Projects::HousekeepingService::LeaseTaken => ex
redirect_to(
- edit_project_path(@project, anchor: 'js-project-advanced-settings'),
+ edit_project_path(@project, anchor: "js-project-advanced-settings"),
alert: ex.to_s
)
end
@@ -196,7 +196,7 @@ class ProjectsController < Projects::ApplicationController
@project.add_export_job(current_user: current_user)
redirect_to(
- edit_project_path(@project, anchor: 'js-export-project'),
+ edit_project_path(@project, anchor: "js-export-project"),
notice: _("Project export started. A download link will be sent by email.")
)
end
@@ -206,7 +206,7 @@ class ProjectsController < Projects::ApplicationController
send_upload(@project.export_file, attachment: @project.export_file.filename)
else
redirect_to(
- edit_project_path(@project, anchor: 'js-export-project'),
+ edit_project_path(@project, anchor: "js-export-project"),
alert: _("Project export link has expired. Please generate a new export from your project settings.")
)
end
@@ -219,7 +219,7 @@ class ProjectsController < Projects::ApplicationController
flash[:alert] = _("Project export could not be deleted.")
end
- redirect_to(edit_project_path(@project, anchor: 'js-export-project'))
+ redirect_to(edit_project_path(@project, anchor: "js-export-project"))
end
def generate_new_export
@@ -227,7 +227,7 @@ class ProjectsController < Projects::ApplicationController
export
else
redirect_to(
- edit_project_path(@project, anchor: 'js-export-project'),
+ edit_project_path(@project, anchor: "js-export-project"),
alert: _("Project export could not be deleted.")
)
end
@@ -238,41 +238,41 @@ class ProjectsController < Projects::ApplicationController
@project.reload
render json: {
- star_count: @project.star_count
+ star_count: @project.star_count,
}
end
# rubocop: disable CodeReuse/ActiveRecord
def refs
- find_refs = params['find']
+ find_refs = params["find"]
find_branches = true
find_tags = true
find_commits = true
unless find_refs.nil?
- find_branches = find_refs.include?('branches')
- find_tags = find_refs.include?('tags')
- find_commits = find_refs.include?('commits')
+ find_branches = find_refs.include?("branches")
+ find_tags = find_refs.include?("tags")
+ find_commits = find_refs.include?("commits")
end
options = {}
if find_branches
branches = BranchesFinder.new(@repository, params).execute.take(100).map(&:name)
- options['Branches'] = branches
+ options["Branches"] = branches
end
if find_tags && @repository.tag_count.nonzero?
tags = TagsFinder.new(@repository, params).execute.take(100).map(&:name)
- options['Tags'] = tags
+ options["Tags"] = tags
end
# If reference is commit id - we should add it to branch/tag selectbox
ref = Addressable::URI.unescape(params[:ref])
if find_commits && ref && options.flatten(2).exclude?(ref) && ref =~ /\A[0-9a-zA-Z]{6,52}\z/
- options['Commits'] = [ref]
+ options["Commits"] = [ref]
end
render json: options.to_json
@@ -285,16 +285,16 @@ class ProjectsController < Projects::ApplicationController
# pages list order: repository readme, wiki home, issues list, customize workflow
def render_landing_page
if can?(current_user, :download_code, @project)
- return render 'projects/no_repo' unless @project.repository_exists?
+ return render "projects/no_repo" unless @project.repository_exists?
- render 'projects/empty' if @project.empty_repo?
+ render "projects/empty" if @project.empty_repo?
else
if can?(current_user, :read_wiki, @project)
@project_wiki = @project.wiki
- @wiki_home = @project_wiki.find_page('home', params[:version_id])
+ @wiki_home = @project_wiki.find_page("home", params[:version_id])
elsif @project.feature_available?(:issues, current_user)
@issues = issuables_collection.page(params[:page])
- @collection_type = 'Issue'
+ @collection_type = "Issue"
@issuable_meta_data = issuable_meta_data(@issues, @collection_type)
end
@@ -308,11 +308,11 @@ class ProjectsController < Projects::ApplicationController
def determine_layout
if [:new, :create].include?(action_name.to_sym)
- 'application'
+ "application"
elsif [:edit, :update].include?(action_name.to_sym)
- 'project_settings'
+ "project_settings"
else
- 'project'
+ "project"
end
end
@@ -371,7 +371,7 @@ class ProjectsController < Projects::ApplicationController
snippets_access_level
wiki_access_level
pages_access_level
- ]
+ ],
]
end
@@ -380,12 +380,11 @@ class ProjectsController < Projects::ApplicationController
end
def active_new_project_tab
- project_params[:import_url].present? ? 'import' : 'blank'
+ project_params[:import_url].present? ? "import" : "blank"
end
def repo_exists?
project.repository_exists? && !project.empty_repo?
-
rescue Gitlab::Git::Repository::NoRepository
project.repository.expire_exists_cache
@@ -394,7 +393,7 @@ class ProjectsController < Projects::ApplicationController
def project_view_files?
if current_user
- current_user.project_view == 'files'
+ current_user.project_view == "files"
else
project_view_files_allowed?
end
@@ -404,7 +403,7 @@ class ProjectsController < Projects::ApplicationController
# for the blob/tree, which in this case is just the root of the default branch.
# This way we avoid to access the repository.ref_names.
def extract_ref(_id)
- [get_id, '']
+ [get_id, ""]
end
# Override get_id from ExtractsPath in this case is just the root of the default branch.
@@ -433,11 +432,11 @@ class ProjectsController < Projects::ApplicationController
# to
# localhost/group/project
#
- redirect_to request.original_url.sub(%r{\.git/?\Z}, '') if params[:format] == 'git'
+ redirect_to request.original_url.sub(%r{\.git/?\Z}, "") if params[:format] == "git"
end
def whitelist_query_limiting
- Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42440')
+ Gitlab::QueryLimiting.whitelist("https://gitlab.com/gitlab-org/gitlab-ce/issues/42440")
end
def present_project