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

Updates from `rubocop -a`

parent 612f5e63
......@@ -2,9 +2,9 @@
# 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.
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")
Gitlab::Application.load_tasks
......
......@@ -22,7 +22,7 @@ def edit
end
def update
if deploy_key.update_attributes(update_params)
if deploy_key.update(update_params)
flash[:notice] = 'Deploy key was successfully updated.'
redirect_to admin_deploy_keys_path
else
......@@ -34,7 +34,7 @@ def destroy
deploy_key.destroy
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 }
end
end
......
......@@ -39,7 +39,7 @@ def create
end
def update
if @group.update_attributes(group_params)
if @group.update(group_params)
redirect_to [:admin, @group], notice: 'Group was successfully updated.'
else
render "edit"
......
......@@ -23,7 +23,7 @@ def edit
end
def update
if hook.update_attributes(hook_params)
if hook.update(hook_params)
flash[:notice] = 'System hook was successfully updated.'
redirect_to admin_hooks_path
else
......@@ -34,7 +34,7 @@ def update
def destroy
hook.destroy
redirect_to admin_hooks_path, status: 302
redirect_to admin_hooks_path, status: :found
end
def test
......
......@@ -25,7 +25,7 @@ def edit
end
def update
if @identity.update_attributes(identity_params)
if @identity.update(identity_params)
RepairLdapBlockedUserService.new(@user).execute
redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.'
else
......
......@@ -11,7 +11,7 @@ def destroy
session[:impersonator_id] = nil
redirect_to admin_user_path(original_user), status: 302
redirect_to admin_user_path(original_user), status: :found
end
private
......
......@@ -20,6 +20,6 @@ def index
def cancel_all
Ci::Build.running_or_pending.each(&:cancel)
redirect_to admin_jobs_path, status: 303
redirect_to admin_jobs_path, status: :see_other
end
end
......@@ -16,7 +16,7 @@ def destroy
runner = rp.runner
rp.destroy
redirect_to admin_runner_path(runner), status: 302
redirect_to admin_runner_path(runner), status: :found
end
private
......
......@@ -28,7 +28,7 @@ def update
def destroy
@runner.destroy
redirect_to admin_runners_path, status: 302
redirect_to admin_runners_path, status: :found
end
def resume
......
......@@ -16,7 +16,7 @@ def edit
end
def update
if service.update_attributes(service_params[:service])
if service.update(service_params[:service])
PropagateServiceTemplateWorker.perform_async(service.id) if service.active?
redirect_to admin_application_settings_services_path,
......
......@@ -163,7 +163,7 @@ def remove_email
format.json { head :ok }
else
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
......
......@@ -127,7 +127,7 @@ def render_conflict_response
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."
]
}, status: 409
}, status: :conflict
end
end
end
......
......@@ -27,7 +27,7 @@ def require_lfs_enabled!
message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
documentation_url: help_url
},
status: 501
status: :not_implemented
)
end
......
......@@ -7,6 +7,6 @@ def destroy
@group.remove_avatar!
@group.save
redirect_to edit_group_path(@group), status: 302
redirect_to edit_group_path(@group), status: :found
end
end
......@@ -23,7 +23,7 @@ def update
def 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
def resume
......
......@@ -41,7 +41,7 @@ def render_missing_personal_access_token
"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}" }
]
}, status: 401
}, status: :unauthorized
end
def render_unauthorized
......@@ -50,7 +50,7 @@ def render_unauthorized
{ code: 'UNAUTHORIZED',
message: 'HTTP Basic: Access denied' }
]
}, status: 401
}, status: :unauthorized
end
def auth_params
......
......@@ -5,14 +5,14 @@ def create
return render_404 unless can_read?(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
end
def update
@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
end
......
......@@ -7,7 +7,7 @@ def destroy
ActiveSession.destroy(current_user, params[:id])
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 }
end
end
......
......@@ -4,6 +4,6 @@ def destroy
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
......@@ -39,7 +39,7 @@ def destroy
flash[:alert] = "Could not delete chat nickname #{@chat_name.chat_name}."
end
redirect_to profile_chat_names_path, status: 302
redirect_to profile_chat_names_path, status: :found
end
private
......
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