diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-15 15:11:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-15 15:11:52 +0000 |
| commit | 72770e609d755a1abe304025424b8a90b7337842 (patch) | |
| tree | 55856a85a0362bdf9f21142f62ff010153765a0c | |
| parent | 2daf7f6236d41ba4da71721aa35b2e40092c9b3f (diff) | |
| parent | 5f2f680e802fd8f01ec4dc6977795a46e843229b (diff) | |
| download | gitlab-ce-72770e609d755a1abe304025424b8a90b7337842.tar.gz | |
Merge branch 'ce-6145-extract-app-views-shared-issuable-3' into 'master'
CE: Resolve 3 "Extract EE specific files/lines for app/views/shared/issuable"
See merge request gitlab-org/gitlab-ce!19777
| -rw-r--r-- | app/views/shared/issuable/_sidebar_assignees.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/form/_metadata.html.haml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml index ed3ef6155db..8a13c7a3b83 100644 --- a/app/views/shared/issuable/_sidebar_assignees.html.haml +++ b/app/views/shared/issuable/_sidebar_assignees.html.haml @@ -50,7 +50,7 @@ - data[:multi_select] = true - data['dropdown-title'] = title - data['dropdown-header'] = dropdown_options[:data][:'dropdown-header'] - - data['max-select'] = dropdown_options[:data][:'max-select'] + - data['max-select'] = dropdown_options[:data][:'max-select'] if dropdown_options[:data][:'max-select'] - options[:data].merge!(data) = dropdown_tag(title, options: options) diff --git a/app/views/shared/issuable/form/_metadata.html.haml b/app/views/shared/issuable/form/_metadata.html.haml index 01fbc163a14..bd87bb38e77 100644 --- a/app/views/shared/issuable/form/_metadata.html.haml +++ b/app/views/shared/issuable/form/_metadata.html.haml @@ -25,7 +25,10 @@ = form.hidden_field :label_ids, multiple: true, value: '' .col-sm-10{ class: "#{"col-md-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" } .issuable-form-select-holder - = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false}, dropdown_title: "Select label" + = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false }, dropdown_title: "Select label" + + = render_if_exists "shared/issuable/form/weight", issuable: issuable, form: form + - if has_due_date .col-lg-6 .form-group.row |