diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-11 00:05:00 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-11 00:05:00 +0300 |
| commit | 0350a36f28bfb19fddf570c9f77e181e32efc149 (patch) | |
| tree | 5759422be3454756373e4da136a1f10d2fb4c113 | |
| parent | e16b80ddf669f19ed3e5b312d6f44fc7d9c08293 (diff) | |
Revert "Merge branch 'accept_mr_btn_ci_status' into 'master'"
This reverts commit aab713c121a1c9de0e52e253601ee304f3deff6b.
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 14 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 4 |
2 files changed, 1 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index ca7a2eff228..a1a5208c59c 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -19,20 +19,6 @@ .accept-merge-holder { .accept-action { display: inline-block; - - .accept_merge_request { - &.ci-pending, - &.ci-running { - @include btn-orange; - } - - &.ci-skipped, - &.ci-failed, - &.ci-canceled, - &.ci-error { - @include btn-red; - } - } } .accept-control { 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 689247f3186..613525437ab 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -1,10 +1,8 @@ -- status_class = @merge_request.ci_commit ? " ci-#{@merge_request.ci_commit.status}" : nil - = form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-requires-input' } do |f| = hidden_field_tag :authenticity_token, form_authenticity_token .accept-merge-holder.clearfix.js-toggle-container .accept-action - = f.button class: "btn btn-create accept_merge_request#{status_class}" do + = f.button class: "btn btn-create accept_merge_request" do Accept Merge Request - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork? .accept-control.checkbox |