summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget/open/_accept.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_accept.html.haml')
-rw-r--r--app/views/projects/merge_requests/widget/open/_accept.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 279e2ec91f8..f7d872aa455 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -4,8 +4,7 @@
= hidden_field_tag :authenticity_token, form_authenticity_token
.accept-merge-holder.clearfix.js-toggle-container
.accept-action
- - ci_commit = @merge_request.ci_commit
- - if ci_commit && ci_commit.active?
+ - if @merge_request.ci_commit && @merge_request.ci_commit.active?
= f.button class: "btn btn-create btn-grouped merge_when_build_succeeds", name: "merge_when_build_succeeds" do
Merge When Build Succeeds
= f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do