Commit 5ac5510fd68fa060986733c07421d8411731ee24
1 parent
d7b667fe
Exists in
master
and in
4 other branches
Fix automerge detection client-side since #3056
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/controllers/merge_requests_controller.rb
| @@ -75,7 +75,7 @@ class MergeRequestsController < ProjectResourceController | @@ -75,7 +75,7 @@ class MergeRequestsController < ProjectResourceController | ||
| 75 | if @merge_request.unchecked? | 75 | if @merge_request.unchecked? |
| 76 | @merge_request.check_if_can_be_merged | 76 | @merge_request.check_if_can_be_merged |
| 77 | end | 77 | end |
| 78 | - render json: {merge_status: @merge_request.human_merge_status_name} | 78 | + render json: {merge_status: @merge_request.merge_status_name} |
| 79 | rescue Gitlab::SatelliteNotExistError | 79 | rescue Gitlab::SatelliteNotExistError |
| 80 | render json: {merge_status: :no_satellite} | 80 | render json: {merge_status: :no_satellite} |
| 81 | end | 81 | end |
app/views/merge_requests/_show.html.haml
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | check_enable: #{@merge_request.unchecked? ? "true" : "false"}, | 32 | check_enable: #{@merge_request.unchecked? ? "true" : "false"}, |
| 33 | url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}", | 33 | url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}", |
| 34 | ci_enable: #{@project.gitlab_ci? ? "true" : "false"}, | 34 | ci_enable: #{@project.gitlab_ci? ? "true" : "false"}, |
| 35 | - current_status: "#{@merge_request.human_merge_status_name}", | 35 | + current_status: "#{@merge_request.merge_status_name}", |
| 36 | action: "#{controller.action_name}" | 36 | action: "#{controller.action_name}" |
| 37 | }); | 37 | }); |
| 38 | }); | 38 | }); |