Skip to content
代码片段 群组 项目
提交 11e063b6 编辑于 作者: Jan Provaznik's avatar Jan Provaznik
浏览文件

Merge branch '239356-rails-http-status' into 'master'

No related branches found
No related tags found
无相关合并请求
---
# Cop supports --autocorrect.
Rails/HttpStatus:
Exclude:
- 'app/controllers/concerns/invisible_captcha_on_signup.rb'
- 'app/controllers/projects/runner_projects_controller.rb'
- 'app/controllers/projects/service_ping_controller.rb'
- 'app/controllers/repositories/lfs_storage_controller.rb'
- 'ee/app/controllers/trials_controller.rb'
......@@ -13,7 +13,7 @@ def on_honeypot_spam_callback
invisible_captcha_honeypot_counter.increment
log_request('Invisible_Captcha_Honeypot_Request')
head(200)
head(:ok)
end
def on_timestamp_spam_callback
......
......@@ -11,7 +11,7 @@ class Projects::RunnerProjectsController < Projects::ApplicationController
def create
@runner = Ci::Runner.find(params[:runner_project][:runner_id])
return head(403) unless can?(current_user, :assign_runner, @runner)
return head(:forbidden) unless can?(current_user, :assign_runner, @runner)
path = project_runners_path(project)
......
......@@ -10,7 +10,7 @@ def web_ide_clientside_preview
Gitlab::UsageDataCounters::WebIdeCounter.increment_previews_count
head(200)
head(:ok)
end
def web_ide_clientside_preview_success
......@@ -20,12 +20,12 @@ def web_ide_clientside_preview_success
Gitlab::UsageDataCounters::EditorUniqueCounter.track_live_preview_edit_action(author: current_user,
project: project)
head(200)
head(:ok)
end
def web_ide_pipelines_count
Gitlab::UsageDataCounters::WebIdeCounter.increment_pipelines_count
head(200)
head(:ok)
end
end
......@@ -49,7 +49,7 @@ def upload_finalize
validate_uploaded_file!
if store_file!(oid, size)
head 200, content_type: LfsRequest::CONTENT_TYPE
head :ok, content_type: LfsRequest::CONTENT_TYPE
else
render plain: 'Unprocessable entity', status: :unprocessable_entity
end
......
......@@ -48,7 +48,7 @@ def create_hand_raise_lead
result = GitlabSubscriptions::CreateHandRaiseLeadService.new.execute(hand_raise_lead_params)
if result.success?
head 200
head :ok
else
render_403
end
......@@ -64,7 +64,7 @@ def extend_reactivate
result = GitlabSubscriptions::ExtendReactivateTrialService.new.execute(extend_reactivate_trial_params) if valid_extension?
if result&.success?
head 200
head :ok
else
render_403
end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册