Fix merge requests views conflicts

https://gitlab.com/gitlab-org/gitlab-ee/commit/0ec82b0a148d626bfe84135d57fd95f3d7d209b0

Fix merge requests views conflicts
https://gitlab.com/gitlab-org/gitlab-ee/commit/0ec82b0a148d626bfe84135d57fd95f3d7d209b0
742c6fbd · Achilleas Pipinellis · cd7d6e73 · 742c6fbd
Commit 742c6fbd authored Sep 06, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/views/projects/_merge_request_settings.html.haml app/views/projects/_merge_request_settings.html.haml +2 -2

No files found.
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
-%fieldset.merge-request-feature.append-bottom-default
+%fieldset.merge-requests-feature.append-bottom-default
  %h5.prepend-top-0
    Merge requests

@@ -78,7 +78,7 @@
        - if @project.approvers.empty?
          %li There are no approvers

-  .form-group
+  .form-group.builds-feature
    .checkbox
      = f.label :only_allow_merge_if_build_succeeds do
        = f.check_box :only_allow_merge_if_build_succeeds