Commit 4ee08b77 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Updates from `rubocop -a`

parent 612f5e63
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# Add your own tasks in files placed in lib/tasks ending in .rake, # Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__) require File.expand_path('config/application', __dir__)
relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__) relative_url_conf = File.expand_path('config/initializers/relative_url', __dir__)
require relative_url_conf if File.exist?("#{relative_url_conf}.rb") require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
Gitlab::Application.load_tasks Gitlab::Application.load_tasks
......
...@@ -22,7 +22,7 @@ class Admin::DeployKeysController < Admin::ApplicationController ...@@ -22,7 +22,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
end end
def update def update
if deploy_key.update_attributes(update_params) if deploy_key.update(update_params)
flash[:notice] = 'Deploy key was successfully updated.' flash[:notice] = 'Deploy key was successfully updated.'
redirect_to admin_deploy_keys_path redirect_to admin_deploy_keys_path
else else
...@@ -34,7 +34,7 @@ class Admin::DeployKeysController < Admin::ApplicationController ...@@ -34,7 +34,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
deploy_key.destroy deploy_key.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to admin_deploy_keys_path, status: 302 } format.html { redirect_to admin_deploy_keys_path, status: :found }
format.json { head :ok } format.json { head :ok }
end end
end end
......
...@@ -39,7 +39,7 @@ class Admin::GroupsController < Admin::ApplicationController ...@@ -39,7 +39,7 @@ class Admin::GroupsController < Admin::ApplicationController
end end
def update def update
if @group.update_attributes(group_params) if @group.update(group_params)
redirect_to [:admin, @group], notice: 'Group was successfully updated.' redirect_to [:admin, @group], notice: 'Group was successfully updated.'
else else
render "edit" render "edit"
......
...@@ -23,7 +23,7 @@ class Admin::HooksController < Admin::ApplicationController ...@@ -23,7 +23,7 @@ class Admin::HooksController < Admin::ApplicationController
end end
def update def update
if hook.update_attributes(hook_params) if hook.update(hook_params)
flash[:notice] = 'System hook was successfully updated.' flash[:notice] = 'System hook was successfully updated.'
redirect_to admin_hooks_path redirect_to admin_hooks_path
else else
...@@ -34,7 +34,7 @@ class Admin::HooksController < Admin::ApplicationController ...@@ -34,7 +34,7 @@ class Admin::HooksController < Admin::ApplicationController
def destroy def destroy
hook.destroy hook.destroy
redirect_to admin_hooks_path, status: 302 redirect_to admin_hooks_path, status: :found
end end
def test def test
......
...@@ -25,7 +25,7 @@ class Admin::IdentitiesController < Admin::ApplicationController ...@@ -25,7 +25,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
end end
def update def update
if @identity.update_attributes(identity_params) if @identity.update(identity_params)
RepairLdapBlockedUserService.new(@user).execute RepairLdapBlockedUserService.new(@user).execute
redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.' redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.'
else else
......
...@@ -11,7 +11,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController ...@@ -11,7 +11,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
session[:impersonator_id] = nil session[:impersonator_id] = nil
redirect_to admin_user_path(original_user), status: 302 redirect_to admin_user_path(original_user), status: :found
end end
private private
......
...@@ -20,6 +20,6 @@ class Admin::JobsController < Admin::ApplicationController ...@@ -20,6 +20,6 @@ class Admin::JobsController < Admin::ApplicationController
def cancel_all def cancel_all
Ci::Build.running_or_pending.each(&:cancel) Ci::Build.running_or_pending.each(&:cancel)
redirect_to admin_jobs_path, status: 303 redirect_to admin_jobs_path, status: :see_other
end end
end end
...@@ -16,7 +16,7 @@ class Admin::RunnerProjectsController < Admin::ApplicationController ...@@ -16,7 +16,7 @@ class Admin::RunnerProjectsController < Admin::ApplicationController
runner = rp.runner runner = rp.runner
rp.destroy rp.destroy
redirect_to admin_runner_path(runner), status: 302 redirect_to admin_runner_path(runner), status: :found
end end
private private
......
...@@ -28,7 +28,7 @@ class Admin::RunnersController < Admin::ApplicationController ...@@ -28,7 +28,7 @@ class Admin::RunnersController < Admin::ApplicationController
def destroy def destroy
@runner.destroy @runner.destroy
redirect_to admin_runners_path, status: 302 redirect_to admin_runners_path, status: :found
end end
def resume def resume
......
...@@ -16,7 +16,7 @@ class Admin::ServicesController < Admin::ApplicationController ...@@ -16,7 +16,7 @@ class Admin::ServicesController < Admin::ApplicationController
end end
def update def update
if service.update_attributes(service_params[:service]) if service.update(service_params[:service])
PropagateServiceTemplateWorker.perform_async(service.id) if service.active? PropagateServiceTemplateWorker.perform_async(service.id) if service.active?
redirect_to admin_application_settings_services_path, redirect_to admin_application_settings_services_path,
......
...@@ -163,7 +163,7 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -163,7 +163,7 @@ class Admin::UsersController < Admin::ApplicationController
format.json { head :ok } format.json { head :ok }
else else
format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') } format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') }
format.json { render json: 'There was an error removing the e-mail.', status: 400 } format.json { render json: 'There was an error removing the e-mail.', status: :bad_request }
end end
end end
end end
......
...@@ -127,7 +127,7 @@ module IssuableActions ...@@ -127,7 +127,7 @@ module IssuableActions
errors: [ errors: [
"Someone edited this #{issuable.human_class_name} at the same time you did. Please refresh your browser and make sure your changes will not unintentionally remove theirs." "Someone edited this #{issuable.human_class_name} at the same time you did. Please refresh your browser and make sure your changes will not unintentionally remove theirs."
] ]
}, status: 409 }, status: :conflict
end end
end end
end end
......
...@@ -27,7 +27,7 @@ module LfsRequest ...@@ -27,7 +27,7 @@ module LfsRequest
message: 'Git LFS is not enabled on this GitLab server, contact your admin.', message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
documentation_url: help_url documentation_url: help_url
}, },
status: 501 status: :not_implemented
) )
end end
......
...@@ -7,6 +7,6 @@ class Groups::AvatarsController < Groups::ApplicationController ...@@ -7,6 +7,6 @@ class Groups::AvatarsController < Groups::ApplicationController
@group.remove_avatar! @group.remove_avatar!
@group.save @group.save
redirect_to edit_group_path(@group), status: 302 redirect_to edit_group_path(@group), status: :found
end end
end end
...@@ -23,7 +23,7 @@ class Groups::RunnersController < Groups::ApplicationController ...@@ -23,7 +23,7 @@ class Groups::RunnersController < Groups::ApplicationController
def destroy def destroy
@runner.destroy @runner.destroy
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), status: 302 redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), status: :found
end end
def resume def resume
......
...@@ -41,7 +41,7 @@ class JwtController < ApplicationController ...@@ -41,7 +41,7 @@ class JwtController < ApplicationController
"You must use a personal access token with 'api' scope for Git over HTTP.\n" \ "You must use a personal access token with 'api' scope for Git over HTTP.\n" \
"You can generate one at #{profile_personal_access_tokens_url}" } "You can generate one at #{profile_personal_access_tokens_url}" }
] ]
}, status: 401 }, status: :unauthorized
end end
def render_unauthorized def render_unauthorized
...@@ -50,7 +50,7 @@ class JwtController < ApplicationController ...@@ -50,7 +50,7 @@ class JwtController < ApplicationController
{ code: 'UNAUTHORIZED', { code: 'UNAUTHORIZED',
message: 'HTTP Basic: Access denied' } message: 'HTTP Basic: Access denied' }
] ]
}, status: 401 }, status: :unauthorized
end end
def auth_params def auth_params
......
...@@ -5,14 +5,14 @@ class NotificationSettingsController < ApplicationController ...@@ -5,14 +5,14 @@ class NotificationSettingsController < ApplicationController
return render_404 unless can_read?(resource) return render_404 unless can_read?(resource)
@notification_setting = current_user.notification_settings_for(resource) @notification_setting = current_user.notification_settings_for(resource)
@saved = @notification_setting.update_attributes(notification_setting_params) @saved = @notification_setting.update(notification_setting_params)
render_response render_response
end end
def update def update
@notification_setting = current_user.notification_settings.find(params[:id]) @notification_setting = current_user.notification_settings.find(params[:id])
@saved = @notification_setting.update_attributes(notification_setting_params) @saved = @notification_setting.update(notification_setting_params)
render_response render_response
end end
......
...@@ -7,7 +7,7 @@ class Profiles::ActiveSessionsController < Profiles::ApplicationController ...@@ -7,7 +7,7 @@ class Profiles::ActiveSessionsController < Profiles::ApplicationController
ActiveSession.destroy(current_user, params[:id]) ActiveSession.destroy(current_user, params[:id])
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_active_sessions_url, status: 302 } format.html { redirect_to profile_active_sessions_url, status: :found }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -4,6 +4,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController ...@@ -4,6 +4,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController
Users::UpdateService.new(current_user, user: @user).execute { |user| user.remove_avatar! } Users::UpdateService.new(current_user, user: @user).execute { |user| user.remove_avatar! }
redirect_to profile_path, status: 302 redirect_to profile_path, status: :found
end end
end end
...@@ -39,7 +39,7 @@ class Profiles::ChatNamesController < Profiles::ApplicationController ...@@ -39,7 +39,7 @@ class Profiles::ChatNamesController < Profiles::ApplicationController
flash[:alert] = "Could not delete chat nickname #{@chat_name.chat_name}." flash[:alert] = "Could not delete chat nickname #{@chat_name.chat_name}."
end end
redirect_to profile_chat_names_path, status: 302 redirect_to profile_chat_names_path, status: :found
end end
private private
......
...@@ -19,7 +19,7 @@ class Profiles::EmailsController < Profiles::ApplicationController ...@@ -19,7 +19,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
Emails::DestroyService.new(current_user, user: current_user).execute(@email) Emails::DestroyService.new(current_user, user: current_user).execute(@email)
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_emails_url, status: 302 } format.html { redirect_to profile_emails_url, status: :found }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -21,7 +21,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController ...@@ -21,7 +21,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController
@gpg_key.destroy @gpg_key.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_gpg_keys_url, status: 302 } format.html { redirect_to profile_gpg_keys_url, status: :found }
format.js { head :ok } format.js { head :ok }
end end
end end
...@@ -30,7 +30,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController ...@@ -30,7 +30,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController
@gpg_key.revoke @gpg_key.revoke
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_gpg_keys_url, status: 302 } format.html { redirect_to profile_gpg_keys_url, status: :found }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -26,7 +26,7 @@ class Profiles::KeysController < Profiles::ApplicationController ...@@ -26,7 +26,7 @@ class Profiles::KeysController < Profiles::ApplicationController
Keys::DestroyService.new(current_user).execute(@key) Keys::DestroyService.new(current_user).execute(@key)
respond_to do |format| respond_to do |format|
format.html { redirect_to profile_keys_url, status: 302 } format.html { redirect_to profile_keys_url, status: :found }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -78,7 +78,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController ...@@ -78,7 +78,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
def destroy def destroy
current_user.disable_two_factor! current_user.disable_two_factor!
redirect_to profile_account_path, status: 302 redirect_to profile_account_path, status: :found
end end
def skip def skip
......
...@@ -61,7 +61,7 @@ class Projects::ApplicationController < ApplicationController ...@@ -61,7 +61,7 @@ class Projects::ApplicationController < ApplicationController
def require_non_empty_project def require_non_empty_project
# Be sure to return status code 303 to avoid a double DELETE: # Be sure to return status code 303 to avoid a double DELETE:
# http://api.rubyonrails.org/classes/ActionController/Redirecting.html # http://api.rubyonrails.org/classes/ActionController/Redirecting.html
redirect_to project_path(@project), status: 303 if @project.empty_repo? redirect_to project_path(@project), status: :see_other if @project.empty_repo?
end end
def require_branch_head def require_branch_head
......
...@@ -21,6 +21,6 @@ class Projects::AvatarsController < Projects::ApplicationController ...@@ -21,6 +21,6 @@ class Projects::AvatarsController < Projects::ApplicationController
@project.save @project.save
redirect_to edit_project_path(@project), status: 302 redirect_to edit_project_path(@project), status: :found
end end
end end
...@@ -98,7 +98,7 @@ class Projects::BranchesController < Projects::ApplicationController ...@@ -98,7 +98,7 @@ class Projects::BranchesController < Projects::ApplicationController
flash_type = result[:status] == :error ? :alert : :notice flash_type = result[:status] == :error ? :alert : :notice
flash[flash_type] = result[:message] flash[flash_type] = result[:message]
redirect_to project_branches_path(@project), status: 303 redirect_to project_branches_path(@project), status: :see_other
end end
format.js { render nothing: true, status: result[:return_code] } format.js { render nothing: true, status: result[:return_code] }
......
...@@ -62,7 +62,7 @@ class Projects::ClustersController < Projects::ApplicationController ...@@ -62,7 +62,7 @@ class Projects::ClustersController < Projects::ApplicationController
def destroy def destroy
if cluster.destroy if cluster.destroy
flash[:notice] = _('Kubernetes cluster integration was successfully removed.') flash[:notice] = _('Kubernetes cluster integration was successfully removed.')
redirect_to project_clusters_path(project), status: 302 redirect_to project_clusters_path(project), status: :found
else else
flash[:notice] = _('Kubernetes cluster integration was not removed.') flash[:notice] = _('Kubernetes cluster integration was not removed.')
render :show render :show
......
...@@ -35,7 +35,7 @@ class Projects::DeployKeysController < Projects::ApplicationController ...@@ -35,7 +35,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
end end
def update def update
if deploy_key.update_attributes(update_params) if deploy_key.update(update_params)
flash[:notice] = 'Deploy key was successfully updated.' flash[:notice] = 'Deploy key was successfully updated.'
redirect_to_repository_settings(@project) redirect_to_repository_settings(@project)
else else
......
...@@ -116,7 +116,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -116,7 +116,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
set_workhorse_internal_api_content_type set_workhorse_internal_api_content_type
render json: Gitlab::Workhorse.terminal_websocket(terminal) render json: Gitlab::Workhorse.terminal_websocket(terminal)
else else
render text: 'Not found', status: 404 render text: 'Not found', status: :not_found
end end
end end
......
...@@ -53,7 +53,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController ...@@ -53,7 +53,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController
end end
send_challenges send_challenges
render plain: "HTTP Basic: Access denied\n", status: 401 render plain: "HTTP Basic: Access denied\n", status: :unauthorized
rescue Gitlab::Auth::MissingPersonalAccessTokenError rescue Gitlab::Auth::MissingPersonalAccessTokenError
render_missing_personal_access_token render_missing_personal_access_token
end end
...@@ -83,7 +83,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController ...@@ -83,7 +83,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController
render plain: "HTTP Basic: Access denied\n" \ render plain: "HTTP Basic: Access denied\n" \
"You must use a personal access token with 'api' scope for Git over HTTP.\n" \ "You must use a personal access token with 'api' scope for Git over HTTP.\n" \
"You can generate one at #{profile_personal_access_tokens_url}", "You can generate one at #{profile_personal_access_tokens_url}",
status: 401 status: :unauthorized
end end
def repository def repository
......
...@@ -24,7 +24,7 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -24,7 +24,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
def update def update
@group_link = @project.project_group_links.find(params[:id]) @group_link = @project.project_group_links.find(params[:id])
@group_link.update_attributes(group_link_params) @group_link.update(group_link_params)
end end
def destroy def destroy
...@@ -34,7 +34,7 @@ class Projects::GroupLinksController < Projects::ApplicationController ...@@ -34,7 +34,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to project_project_members_path(project), status: 302 redirect_to project_project_members_path(project), status: :found
end end
format.js { head :ok } format.js { head :ok }
end end
......
...@@ -29,7 +29,7 @@ class Projects::HooksController < Projects::ApplicationController ...@@ -29,7 +29,7 @@ class Projects::HooksController < Projects::ApplicationController
end end
def update def update
if hook.update_attributes(hook_params) if hook.update(hook_params)
flash[:notice] = 'Hook was successfully updated.' flash[:notice] = 'Hook was successfully updated.'
redirect_to project_settings_integrations_path(@project) redirect_to project_settings_integrations_path(@project)
else else
...@@ -48,7 +48,7 @@ class Projects::HooksController < Projects::ApplicationController ...@@ -48,7 +48,7 @@ class Projects::HooksController < Projects::ApplicationController
def destroy def destroy
hook.destroy hook.destroy
redirect_to project_settings_integrations_path(@project), status: 302 redirect_to project_settings_integrations_path(@project), status: :found
end end
private private
......
...@@ -39,7 +39,7 @@ class Projects::LabelsController < Projects::ApplicationController ...@@ -39,7 +39,7 @@ class Projects::LabelsController < Projects::ApplicationController
else else
respond_to do |format| respond_to do |format|
format.html { render :new } format.html { render :new }
format.json { render json: { message: @label.errors.messages }, status: 400 } format.json { render json: { message: @label.errors.messages }, status: :bad_request }
end end
end end
end end
...@@ -115,7 +115,7 @@ class Projects::LabelsController < Projects::ApplicationController ...@@ -115,7 +115,7 @@ class Projects::LabelsController < Projects::ApplicationController
flash[:notice] = "#{@label.title} promoted to <a href=\"#{group_labels_path(@project.group)}\">group label</a>.".html_safe flash[:notice] = "#{@label.title} promoted to <a href=\"#{group_labels_path(@project.group)}\">group label</a>.".html_safe
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to(project_labels_path(@project), status: 303) redirect_to(project_labels_path(@project), status: :see_other)
end end
format.json do format.json do
render json: { url: project_labels_path(@project) } render json: { url: project_labels_path(@project) }
......
...@@ -25,7 +25,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController ...@@ -25,7 +25,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
message: 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.', message: 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.',
documentation_url: "#{Gitlab.config.gitlab.url}/help" documentation_url: "#{Gitlab.config.gitlab.url}/help"
}, },
status: 501 status: :not_implemented
) )
end end
......
...@@ -28,7 +28,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController ...@@ -28,7 +28,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController
if store_file!(oid, size) if store_file!(oid, size)
head 200 head 200
else else
render plain: 'Unprocessable entity', status: 422 render plain: 'Unprocessable entity', status: :unprocessable_entity
end end
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid
render_lfs_forbidden render_lfs_forbidden
......
...@@ -227,7 +227,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -227,7 +227,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
def rebase def rebase
RebaseWorker.perform_async(@merge_request.id, current_user.id) RebaseWorker.perform_async(@merge_request.id, current_user.id)
render nothing: true, status: 200 render nothing: true, status: :ok
end end
protected protected
......
...@@ -96,7 +96,7 @@ class Projects::MilestonesController < Projects::ApplicationController ...@@ -96,7 +96,7 @@ class Projects::MilestonesController < Projects::ApplicationController
Milestones::DestroyService.new(project, current_user).execute(milestone) Milestones::DestroyService.new(project, current_user).execute(milestone)
respond_to do |format| respond_to do |format|
format.html { redirect_to namespace_project_milestones_path, status: 303 } format.html { redirect_to namespace_project_milestones_path, status: :see_other }
format.js { head :ok } format.js { head :ok }
end end
end end
......
...@@ -13,7 +13,7 @@ class Projects::MirrorsController < Projects::ApplicationController ...@@ -13,7 +13,7 @@ class Projects::MirrorsController < Projects::ApplicationController
end end
def update def update
if project.update_attributes(mirror_params) if project.update(mirror_params)
flash[:notice] = 'Mirroring settings were successfully updated.' flash[:notice] = 'Mirroring settings were successfully updated.'
else else
flash[:alert] = project.errors.full_messages.join(', ').html_safe flash[:alert] = project.errors.full_messages.join(', ').html_safe
......
...@@ -64,7 +64,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController ...@@ -64,7 +64,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
def destroy def destroy
if schedule.destroy if schedule.destroy
redirect_to pipeline_schedules_path(@project), status: 302 redirect_to pipeline_schedules_path(@project), status: :found
else else
redirect_to pipeline_schedules_path(@project), redirect_to pipeline_schedules_path(@project),
status: :forbidden, status: :forbidden,
......
...@@ -14,7 +14,7 @@ class Projects::ReleasesController < Projects::ApplicationController ...@@ -14,7 +14,7 @@ class Projects::ReleasesController < Projects::ApplicationController
# it exists only to save a description to each Tag. # it exists only to save a description to each Tag.
# If description is empty we should destroy the existing record. # If description is empty we should destroy the existing record.
if release_params[:description].present? if release_params[:description].present?
release.update_attributes(release_params) release.update(release_params)
else else
release.destroy release.destroy
end end
......
...@@ -24,7 +24,7 @@ class Projects::RepositoriesController < Projects::ApplicationController ...@@ -24,7 +24,7 @@ class Projects::RepositoriesController < Projects::ApplicationController
send_git_archive @repository, ref: @ref, format: params[:format], append_sha: append_sha send_git_archive @repository, ref: @ref, format: params[:format], append_sha: append_sha
rescue => ex rescue => ex
logger.error("#{self.class.name}: #{ex}") logger.error("#{self.class.name}: #{ex}")
return git_not_found! git_not_found!
end end
def assign_archive_vars def assign_archive_vars
......
...@@ -21,6 +21,6 @@ class Projects::RunnerProjectsController < Projects::ApplicationController ...@@ -21,6 +21,6 @@ class Projects::RunnerProjectsController < Projects::ApplicationController
runner_project = project.runner_projects.find(params[:id]) runner_project = project.runner_projects.find(params[:id])
runner_project.destroy runner_project.destroy
redirect_to project_runners_path(project), status: 302 redirect_to project_runners_path(project), status: :found
end end
end end
...@@ -24,7 +24,7 @@ class Projects::RunnersController < Projects::ApplicationController ...@@ -24,7 +24,7 @@ class Projects::RunnersController < Projects::ApplicationController
@runner.destroy @runner.destroy
end end
redirect_to project_runners_path(@project), status: 302 redirect_to project_runners_path(@project), status: :found
end end
def resume def resume
......
...@@ -34,7 +34,7 @@ class Projects::ServicesController < Projects::ApplicationController ...@@ -34,7 +34,7 @@ class Projects::ServicesController < Projects::ApplicationController
private private
def service_test_response def service_test_response
if @service.update_attributes(service_params[:service]) if @service.update(service_params[:service])
data = @service.test_data(project, current_user) data = @service.test_data(project, current_user)
outcome = @service.test(data) outcome = @service.test(data)
......
...@@ -82,7 +82,7 @@ class Projects::SnippetsController < Projects::ApplicationController ...@@ -82,7 +82,7 @@ class Projects::SnippetsController < Projects::ApplicationController
@snippet.destroy @snippet.destroy
redirect_to project_snippets_path(@project), status: 302 redirect_to project_snippets_path(@project), status: :found
end end
protected protected
......
...@@ -50,7 +50,7 @@ class Projects::TagsController < Projects::ApplicationController ...@@ -50,7 +50,7 @@ class Projects::TagsController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
if result[:status] == :success if result[:status] == :success
format.html do format.html do
redirect_to project_tags_path(@project), status: 303 redirect_to project_tags_path(@project), status: :see_other
end end
format.js format.js
......
...@@ -14,6 +14,6 @@ class Projects::TemplatesController < Projects::ApplicationController ...@@ -14,6 +14,6 @@ class Projects::TemplatesController < Projects::ApplicationController
def get_template_class def get_template_class
template_types = { issue: Gitlab::Template::IssueTemplate, merge_request: Gitlab::Template::MergeRequestTemplate }.with_indifferent_access template_types = { issue: Gitlab::Template::IssueTemplate, merge_request: Gitlab::Template::MergeRequestTemplate }.with_indifferent_access
@template_type = template_types[params[:template_type]] @template_type = template_types[params[:template_type]]
render json: [], status: 404 unless @template_type render json: [], status: :not_found unless @template_type
end end
end end
...@@ -50,7 +50,7 @@ class Projects::TriggersController < Projects::ApplicationController ...@@ -50,7 +50,7 @@ class Projects::TriggersController < Projects::ApplicationController
flash[:alert] = "Could not remove the trigger." flash[:alert] = "Could not remove the trigger."
end end
redirect_to project_settings_ci_cd_path(@project), status: 302 redirect_to project_settings_ci_cd_path(@project), status: :found
end end
private private
......
...@@ -120,7 +120,7 @@ class Projects::WikisController < Projects::ApplicationController ...@@ -120,7 +120,7 @@ class Projects::WikisController < Projects::ApplicationController
rescue ProjectWiki::CouldNotCreateWikiError 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 false
end end
def wiki_params def wiki_params
...@@ -129,7 +129,7 @@ class Projects::WikisController < Projects::ApplicationController ...@@ -129,7 +129,7 @@ class Projects::WikisController < Projects::ApplicationController
def build_page(args) def build_page(args)
WikiPage.new(@project_wiki).tap do |page| WikiPage.new(@project_wiki).tap do |page|
page.update_attributes(args) page.update(args)
end end
end end
end end
...@@ -133,7 +133,7 @@ class ProjectsController < Projects::ApplicationController ...@@ -133,7 +133,7 @@ class ProjectsController < Projects::ApplicationController
::Projects::DestroyService.new(@project, current_user, {}).async_execute ::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: 302 redirect_to dashboard_projects_path, status: :found
rescue Projects::DestroyService::DestroyError => ex rescue Projects::DestroyService::DestroyError => ex
redirect_to edit_project_path(@project), status: 302, alert: ex.message redirect_to edit_project_path(@project), status: 302, alert: ex.message
end end
......
...@@ -32,8 +32,8 @@ class SessionsController < Devise::SessionsController ...@@ -32,8 +32,8 @@ class SessionsController < Devise::SessionsController
super do |resource| super do |resource|
# User has successfully signed in, so clear any unused reset token # User has successfully signed in, so clear any unused reset token
if resource.reset_password_token.present? if resource.reset_password_token.present?
resource.update_attributes(reset_password_token: nil, resource.update(reset_password_token: nil,
reset_password_sent_at: nil) reset_password_sent_at: nil)
end end
# hide the signed-in notification # hide the signed-in notification
......
...@@ -13,7 +13,7 @@ module Sherlock ...@@ -13,7 +13,7 @@ module Sherlock
def destroy_all def destroy_all
Gitlab::Sherlock.collection.clear Gitlab::Sherlock.collection.clear
redirect_to :back, status: 302 redirect_to :back, status: :found
end end
end end
end end
...@@ -89,7 +89,7 @@ class SnippetsController < ApplicationController ...@@ -89,7 +89,7 @@ class SnippetsController < ApplicationController
@snippet.destroy @snippet.destroy
redirect_to snippets_path, status: 302 redirect_to snippets_path, status: :found
end end
protected protected
......
...@@ -371,7 +371,7 @@ module Ci ...@@ -371,7 +371,7 @@ module Ci
def update_coverage def update_coverage
coverage = trace.extract_coverage(coverage_regex) coverage = trace.extract_coverage(coverage_regex)
update_attributes(coverage: coverage) if coverage.present? update(coverage: coverage) if coverage.present?
end end
def parse_trace_sections! def parse_trace_sections!
......
...@@ -23,7 +23,7 @@ module ProtectedRef ...@@ -23,7 +23,7 @@ module ProtectedRef
# If we don't `protected_branch` or `protected_tag` would be empty and # If we don't `protected_branch` or `protected_tag` would be empty and
# `project` cannot be delegated to it, which in turn would cause validations # `project` cannot be delegated to it, which in turn would cause validations
# to fail. # to fail.
has_many :"#{type}_access_levels", inverse_of: self.model_name.singular # rubocop:disable Cop/ActiveRecordDependent has_many :"#{type}_access_levels", inverse_of: self.model_name.singular
validates :"#{type}_access_levels", length: { is: 1, message: "are restricted to a single instance per #{self.model_name.human}." } validates :"#{type}_access_levels", length: { is: 1, message: "are restricted to a single instance per #{self.model_name.human}." }
......
...@@ -107,7 +107,7 @@ class ProjectWiki ...@@ -107,7 +107,7 @@ class ProjectWiki
update_project_activity update_project_activity
rescue Gitlab::Git::Wiki::DuplicatePageError => e rescue Gitlab::Git::Wiki::DuplicatePageError => e
@error_message = "Duplicate page: #{e.message}" @error_message = "Duplicate page: #{e.message}"
return false false
end end
def update_page(page, content:, title: nil, format: :markdown, message: nil) def update_page(page, content:, title: nil, format: :markdown, message: nil)
......
...@@ -57,7 +57,7 @@ class RemoteMirror < ActiveRecord::Base ...@@ -57,7 +57,7 @@ class RemoteMirror < ActiveRecord::Base
Gitlab::Metrics.add_event(:remote_mirrors_finished, path: remote_mirror.project.full_path) Gitlab::Metrics.add_event(:remote_mirrors_finished, path: remote_mirror.project.full_path)
timestamp = Time.now timestamp = Time.now
remote_mirror.update_attributes!( remote_mirror.update!(
last_update_at: timestamp, last_successful_update_at: timestamp, last_error: nil last_update_at: timestamp, last_successful_update_at: timestamp, last_error: nil
) )
end end
......
...@@ -496,7 +496,7 @@ class User < ActiveRecord::Base ...@@ -496,7 +496,7 @@ class User < ActiveRecord::Base
def disable_two_factor! def disable_two_factor!
transaction do transaction do
update_attributes( update(
otp_required_for_login: false, otp_required_for_login: false,
encrypted_otp_secret: nil, encrypted_otp_secret: nil,
encrypted_otp_secret_iv: nil, encrypted_otp_secret_iv: nil,
...@@ -1053,7 +1053,7 @@ class User < ActiveRecord::Base ...@@ -1053,7 +1053,7 @@ class User < ActiveRecord::Base
return @global_notification_setting if defined?(@global_notification_setting) return @global_notification_setting if defined?(@global_notification_setting)
@global_notification_setting = notification_settings.find_or_initialize_by(source: nil) @global_notification_setting = notification_settings.find_or_initialize_by(source: nil)
@global_notification_setting.update_attributes(level: NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL]) unless @global_notification_setting.persisted? @global_notification_setting.update(level: NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL]) unless @global_notification_setting.persisted?
@global_notification_setting @global_notification_setting
end end
......
...@@ -190,7 +190,7 @@ class WikiPage ...@@ -190,7 +190,7 @@ class WikiPage
# Returns the String SHA1 of the newly created page # Returns the String SHA1 of the newly created page
# or False if the save was unsuccessful. # or False if the save was unsuccessful.
def create(attrs = {}) def create(attrs = {})
update_attributes(attrs) update(attrs)
save(page_details: title) do save(page_details: title) do
wiki.create_page(title, content, format, message) wiki.create_page(title, content, format, message)
...@@ -216,7 +216,7 @@ class WikiPage ...@@ -216,7 +216,7 @@ class WikiPage
raise PageChangedError raise PageChangedError
end end
update_attributes(attrs) update(attrs)
if title_changed? if title_changed?
page_details = title page_details = title
......
...@@ -3,7 +3,7 @@ module Badges ...@@ -3,7 +3,7 @@ module Badges
# returns the updated badge # returns the updated badge
def execute(badge) def execute(badge)
if params.present? if params.present?
badge.update_attributes(params) badge.update(params)
end end
badge badge
......
...@@ -13,8 +13,6 @@ module Commits ...@@ -13,8 +13,6 @@ module Commits
# rubocop:disable GitlabSecurity/PublicSend # rubocop:disable GitlabSecurity/PublicSend
message = @commit.public_send(:"#{action}_message", current_user) message = @commit.public_send(:"#{action}_message", current_user)
# rubocop:disable GitlabSecurity/PublicSend
repository.public_send( repository.public_send(
action, action,
current_user, current_user,
......
...@@ -130,7 +130,7 @@ class IssuableBaseService < BaseService ...@@ -130,7 +130,7 @@ class IssuableBaseService < BaseService
def create_issuable(issuable, attributes, label_ids:) def create_issuable(issuable, attributes, label_ids:)
issuable.with_transaction_returning_status do issuable.with_transaction_returning_status do
if issuable.save if issuable.save
issuable.update_attributes(label_ids: label_ids) issuable.update(label_ids: label_ids)
end end
end end
end end
......
...@@ -6,7 +6,7 @@ module Members ...@@ -6,7 +6,7 @@ module Members
old_access_level = member.human_access old_access_level = member.human_access
if member.update_attributes(params) if member.update(params)
after_execute(action: permission, old_access_level: old_access_level, member: member) after_execute(action: permission, old_access_level: old_access_level, member: member)
end end
......
...@@ -26,7 +26,7 @@ module MergeRequests ...@@ -26,7 +26,7 @@ module MergeRequests
Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}") Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}")
merge_request.update_attributes(rebase_commit_sha: rebase_sha) merge_request.update(rebase_commit_sha: rebase_sha)
Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}") Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}")
......
...@@ -11,7 +11,7 @@ module Milestones ...@@ -11,7 +11,7 @@ module Milestones
end end
if params.present? if params.present?
milestone.update_attributes(params.except(:state_event)) milestone.update(params.except(:state_event))
end end
milestone milestone
......
...@@ -5,7 +5,7 @@ module Notes ...@@ -5,7 +5,7 @@ module Notes
old_mentioned_users = note.mentioned_users.to_a old_mentioned_users = note.mentioned_users.to_a
note.update_attributes(params.merge(updated_by: current_user)) note.update(params.merge(updated_by: current_user))
note.create_new_cross_references!(current_user) note.create_new_cross_references!(current_user)
if note.previous_changes.include?('note') if note.previous_changes.include?('note')
......
...@@ -43,8 +43,6 @@ module NotificationRecipientService ...@@ -43,8 +43,6 @@ module NotificationRecipientService
def target def target
raise 'abstract' raise 'abstract'
end end
# rubocop:disable Rails/Delegate
def project def project
target.project target.project
end end
......
...@@ -124,7 +124,7 @@ module Projects ...@@ -124,7 +124,7 @@ module Projects
# It's possible that the project was destroyed, but some after_commit # It's possible that the project was destroyed, but some after_commit
# hook failed and caused us to end up here. A destroyed model will be a frozen hash, # hook failed and caused us to end up here. A destroyed model will be a frozen hash,
# which cannot be altered. # which cannot be altered.
project.update_attributes(delete_error: message, pending_delete: false) unless project.destroyed? project.update(delete_error: message, pending_delete: false) unless project.destroyed?
log_error("Deletion failed on #{project.full_path} with the following message: #{message}") log_error("Deletion failed on #{project.full_path} with the following message: #{message}")
end end
......
...@@ -37,7 +37,7 @@ module Projects ...@@ -37,7 +37,7 @@ module Projects
return new_project unless new_project.persisted? return new_project unless new_project.persisted?
builds_access_level = @project.project_feature.builds_access_level builds_access_level = @project.project_feature.builds_access_level
new_project.project_feature.update_attributes(builds_access_level: builds_access_level) new_project.project_feature.update(builds_access_level: builds_access_level)
link_fork_network(new_project) link_fork_network(new_project)
......
...@@ -22,7 +22,7 @@ module Projects ...@@ -22,7 +22,7 @@ module Projects
# If the block added errors, don't try to save the project # If the block added errors, don't try to save the project
return validation_failed! if project.errors.any? return validation_failed! if project.errors.any?
if project.update_attributes(params.except(:default_branch)) if project.update(params.except(:default_branch))
if project.previous_changes.include?('path') if project.previous_changes.include?('path')
project.rename_repo project.rename_repo
else else
......
...@@ -7,7 +7,7 @@ class UpdateReleaseService < BaseService ...@@ -7,7 +7,7 @@ class UpdateReleaseService < BaseService
release = project.releases.find_by(tag: tag_name) release = project.releases.find_by(tag: tag_name)
if release if release
release.update_attributes(description: release_description) release.update(description: release_description)
success(release) success(release)
else else
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Style/Documentation
module ObjectStorage module ObjectStorage
class MigrateUploadsWorker class MigrateUploadsWorker
......
require File.expand_path('../boot', __FILE__) require File.expand_path('boot', __dir__)
require 'rails/all' require 'rails/all'
...@@ -211,7 +211,7 @@ module Gitlab ...@@ -211,7 +211,7 @@ module Gitlab
next unless name.include?('namespace_project') next unless name.include?('namespace_project')
define_method(name.sub('namespace_project', 'project')) do |project, *args| define_method(name.sub('namespace_project', 'project')) do |project, *args|
send(name, project&.namespace, project, *args) # rubocop:disable GitlabSecurity/PublicSend send(name, project&.namespace, project, *args)
end end
end end
end end
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
if %w[1 true].include?(ENV["RAILS5"]) if %w[1 true].include?(ENV["RAILS5"])
require_relative 'application' require_relative 'application'
else else
require File.expand_path('../application', __FILE__) require File.expand_path('application', __dir__)
end end
# Initialize the rails application # Initialize the rails application
......
...@@ -17,7 +17,7 @@ module ActiveRecord ...@@ -17,7 +17,7 @@ module ActiveRecord
lock_col = self.class.locking_column lock_col = self.class.locking_column
previous_lock_value = send(lock_col).to_i # rubocop:disable GitlabSecurity/PublicSend previous_lock_value = send(lock_col).to_i
# This line is added as a patch # This line is added as a patch
previous_lock_value = nil if previous_lock_value == '0' || previous_lock_value == 0 previous_lock_value = nil if previous_lock_value == '0' || previous_lock_value == 0
...@@ -47,7 +47,7 @@ module ActiveRecord ...@@ -47,7 +47,7 @@ module ActiveRecord
# If something went wrong, revert the version. # If something went wrong, revert the version.
rescue Exception rescue Exception
send(lock_col + '=', previous_lock_value) # rubocop:disable GitlabSecurity/PublicSend send(lock_col + '=', previous_lock_value)
raise raise
end end
end end
......
...@@ -112,9 +112,9 @@ module API ...@@ -112,9 +112,9 @@ module API
can_push = params[:can_push].nil? ? deploy_keys_project.can_push : params[:can_push] can_push = params[:can_push].nil? ? deploy_keys_project.can_push : params[:can_push]
title = params[:title] || deploy_keys_project.deploy_key.title title = params[:title] || deploy_keys_project.deploy_key.title
result = deploy_keys_project.update_attributes(can_push: can_push, result = deploy_keys_project.update(can_push: can_push,
deploy_key_attributes: { id: params[:key_id], deploy_key_attributes: { id: params[:key_id],
title: title }) title: title })
if result if result
present deploy_keys_project, with: Entities::DeployKeysProject present deploy_keys_project, with: Entities::DeployKeysProject
......
...@@ -80,7 +80,7 @@ module API ...@@ -80,7 +80,7 @@ module API
update_params = declared_params(include_missing: false) update_params = declared_params(include_missing: false)
if hook.update_attributes(update_params) if hook.update(update_params)
present hook, with: Entities::ProjectHook present hook, with: Entities::ProjectHook
else else
error!("Invalid url given", 422) if hook.errors[:url].present? error!("Invalid url given", 422) if hook.errors[:url].present?
......
...@@ -787,7 +787,7 @@ module API ...@@ -787,7 +787,7 @@ module API
service = user_project.find_or_initialize_service(service_slug.underscore) service = user_project.find_or_initialize_service(service_slug.underscore)
service_params = declared_params(include_missing: false).merge(active: true) service_params = declared_params(include_missing: false).merge(active: true)
if service.update_attributes(service_params) if service.update(service_params)
present service, with: Entities::ProjectService present service, with: Entities::ProjectService
else else
render_api_error!('400 Bad Request', 400) render_api_error!('400 Bad Request', 400)
...@@ -807,7 +807,7 @@ module API ...@@ -807,7 +807,7 @@ module API
hash.merge!(key => nil) hash.merge!(key => nil)
end end
unless service.update_attributes(attrs.merge(active: false)) unless service.update(attrs.merge(active: false))
render_api_error!('400 Bad Request', 400) render_api_error!('400 Bad Request', 400)
end end
end end
......
...@@ -186,7 +186,7 @@ module API ...@@ -186,7 +186,7 @@ module API
identity = user.identities.find_by(provider: identity_attrs[:provider]) identity = user.identities.find_by(provider: identity_attrs[:provider])
if identity if identity
identity.update_attributes(identity_attrs) identity.update(identity_attrs)
else else
identity = user.identities.build(identity_attrs) identity = user.identities.build(identity_attrs)
identity.save identity.save
......
...@@ -18,7 +18,7 @@ module Banzai ...@@ -18,7 +18,7 @@ module Banzai
PARSE_OPTIONS = [ PARSE_OPTIONS = [
:FOOTNOTES, # parse footnotes. :FOOTNOTES, # parse footnotes.
:STRIKETHROUGH_DOUBLE_TILDE, # parse strikethroughs by double tildes (as redcarpet does). :STRIKETHROUGH_DOUBLE_TILDE, # parse strikethroughs by double tildes (as redcarpet does).
:VALIDATE_UTF8 # replace illegal sequences with the replacement character U+FFFD. :VALIDATE_UTF8 # replace illegal sequences with the replacement character U+FFFD.
].freeze ].freeze
# The `:GITHUB_PRE_LANG` option is not used intentionally because # The `:GITHUB_PRE_LANG` option is not used intentionally because
......
...@@ -48,7 +48,7 @@ module Gitlab ...@@ -48,7 +48,7 @@ module Gitlab
gl_user gl_user
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
log.info "(#{provider}) Error saving user #{auth_hash.uid} (#{auth_hash.email}): #{gl_user.errors.full_messages}" log.info "(#{provider}) Error saving user #{auth_hash.uid} (#{auth_hash.email}): #{gl_user.errors.full_messages}"
return self, e.record.errors [self, e.record.errors]
end end
def gl_user def gl_user
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
# rubocop:disable Metrics/LineLength
module Gitlab module Gitlab
module BackgroundMigration module BackgroundMigration
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
class Gitlab::BackgroundMigration::CreateGpgKeySubkeysFromGpgKeys class Gitlab::BackgroundMigration::CreateGpgKeySubkeysFromGpgKeys
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/MethodLength # rubocop:disable Metrics/MethodLength
# rubocop:disable Metrics/LineLength
# rubocop:disable Metrics/AbcSize # rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/AbcSize
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/MethodLength # rubocop:disable Metrics/MethodLength
# rubocop:disable Metrics/LineLength
# rubocop:disable Metrics/ClassLength # rubocop:disable Metrics/ClassLength
# rubocop:disable Metrics/BlockLength # rubocop:disable Metrics/BlockLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
......
...@@ -19,7 +19,7 @@ module Gitlab ...@@ -19,7 +19,7 @@ module Gitlab
create_fork_networks_for_missing_projects(start_id, end_id) create_fork_networks_for_missing_projects(start_id, end_id)
create_fork_networks_memberships_for_root_projects(start_id, end_id) create_fork_networks_memberships_for_root_projects(start_id, end_id)
delay = BackgroundMigration::CreateForkNetworkMembershipsRange::RESCHEDULE_DELAY # rubocop:disable Metrics/LineLength delay = BackgroundMigration::CreateForkNetworkMembershipsRange::RESCHEDULE_DELAY
BackgroundMigrationWorker.perform_in( BackgroundMigrationWorker.perform_in(
delay, "CreateForkNetworkMembershipsRange", [start_id, end_id] delay, "CreateForkNetworkMembershipsRange", [start_id, end_id]
) )
......
# frozen_string_literal: true # frozen_string_literal: true
# rubocop:disable Metrics/LineLength
# rubocop:disable Metrics/MethodLength
# rubocop:disable Metrics/ClassLength
# rubocop:disable Style/Documentation # rubocop:disable Style/Documentation
module Gitlab module Gitlab
......
...@@ -4,7 +4,7 @@ module Gitlab ...@@ -4,7 +4,7 @@ module Gitlab
module BackgroundMigration module BackgroundMigration
# This class processes a batch of rows in `untracked_files_for_uploads` by # This class processes a batch of rows in `untracked_files_for_uploads` by
# adding each file to the `uploads` table if it does not exist. # adding each file to the `uploads` table if it does not exist.
class PopulateUntrackedUploads # rubocop:disable Metrics/ClassLength class PopulateUntrackedUploads
def perform(start_id, end_id) def perform(start_id, end_id)
return unless migrate? return unless migrate?
......
...@@ -4,7 +4,7 @@ module Gitlab ...@@ -4,7 +4,7 @@ module Gitlab
module PopulateUntrackedUploadsDependencies module PopulateUntrackedUploadsDependencies
# This class is responsible for producing the attributes necessary to # This class is responsible for producing the attributes necessary to
# track an uploaded file in the `uploads` table. # track an uploaded file in the `uploads` table.
class UntrackedFile < ActiveRecord::Base # rubocop:disable Metrics/ClassLength, Metrics/LineLength class UntrackedFile < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
self.table_name = 'untracked_files_for_uploads' self.table_name = 'untracked_files_for_uploads'
# Ends with /:random_hex/:filename # Ends with /:random_hex/:filename
...@@ -134,7 +134,7 @@ module Gitlab ...@@ -134,7 +134,7 @@ module Gitlab
# Not including a leading slash # Not including a leading slash
def path_relative_to_upload_dir def path_relative_to_upload_dir
upload_dir = Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR # rubocop:disable Metrics/LineLength upload_dir = Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR
base = %r{\A#{Regexp.escape(upload_dir)}/} base = %r{\A#{Regexp.escape(upload_dir)}/}
@path_relative_to_upload_dir ||= path.sub(base, '') @path_relative_to_upload_dir ||= path.sub(base, '')
end end
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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