Commit 5ac5510f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix automerge detection client-side since #3056

parent d7b667fe
......@@ -75,7 +75,7 @@ def automerge_check
if @merge_request.unchecked?
@merge_request.check_if_can_be_merged
end
render json: {merge_status: @merge_request.human_merge_status_name}
render json: {merge_status: @merge_request.merge_status_name}
rescue Gitlab::SatelliteNotExistError
render json: {merge_status: :no_satellite}
end
......
......@@ -32,7 +32,7 @@
check_enable: #{@merge_request.unchecked? ? "true" : "false"},
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
current_status: "#{@merge_request.human_merge_status_name}",
current_status: "#{@merge_request.merge_status_name}",
action: "#{controller.action_name}"
});
});
......
Supports Markdown
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