fixed merge conflict: app/views/shared/issuable/_sidebar.html.haml

b62d30d4 · James Lopez · ebb5afe7 · b62d30d4
Commit b62d30d4 authored Feb 10, 2016 by James Lopez
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/views/shared/issuable/_sidebar.html.haml app/views/shared/issuable/_sidebar.html.haml +1 -1

No files found.
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -111,7 +111,7 @@
            - else
              .light None
          .selectbox
-            = f.select :weight, projects_weight_options(issuable.weight), { include_blank: true },
+            = f.select :weight, issues_weight_options_for_edit(issuable.weight), { include_blank: true },
              { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
      = render "shared/issuable/participants", participants: issuable.participants(current_user)