diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-26 10:47:27 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-02-26 10:47:27 +0200 |
| commit | 5ac5510fd68fa060986733c07421d8411731ee24 (patch) | |
| tree | 72f0897b69e4bfdf8633b71a13ecd45f6cb7fa83 /app/views/merge_requests | |
| parent | d7b667fee238cfd457bdc143a37585ac931cf4ad (diff) | |
| download | gitlab-ce-5ac5510fd68fa060986733c07421d8411731ee24.tar.gz | |
Fix automerge detection client-side since #3056
Diffstat (limited to 'app/views/merge_requests')
| -rw-r--r-- | app/views/merge_requests/_show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/merge_requests/_show.html.haml b/app/views/merge_requests/_show.html.haml index 6b6100f5d47..08b80172645 100644 --- a/app/views/merge_requests/_show.html.haml +++ b/app/views/merge_requests/_show.html.haml @@ -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}" }); }); |