summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--spec/helpers/issuables_helper_spec.rb (renamed from spec/helpers/issuable_helper_spec.rb)0
-rw-r--r--spec/javascripts/fixtures/issue_sidebar_label.html.haml2
3 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2ff1be3322b..e37b43668e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,7 +18,7 @@ v 8.11.0 (unreleased)
- API: Endpoints for enabling and disabling deploy keys
- API: List access requests, request access, approve, and deny access requests to a project or a group. !4833
- Use long options for curl examples in documentation !5703 (winniehell)
- - Added tooltip listing label names to the labels value in the collapsed issuable sidebar
+ - Added tooltip listing label names to the labels value in the collapsed issuable sidebar
- Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell)
- Fix badge count alignment (ClemMakesApps)
- GitLab Performance Monitoring can now track custom events such as the number of tags pushed to a repository
diff --git a/spec/helpers/issuable_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index 2dd2eab0524..2dd2eab0524 100644
--- a/spec/helpers/issuable_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
diff --git a/spec/javascripts/fixtures/issue_sidebar_label.html.haml b/spec/javascripts/fixtures/issue_sidebar_label.html.haml
index 74421730b98..397bdc85c67 100644
--- a/spec/javascripts/fixtures/issue_sidebar_label.html.haml
+++ b/spec/javascripts/fixtures/issue_sidebar_label.html.haml
@@ -5,7 +5,7 @@
Edit
.selectbox.hide-collapsed{ style: "display: none;" }
.dropdown
- %button.dropdown-menu-toggle.js-label-select.js-multiselect{"data-ability-name" => "issue", "data-field-name" => "issue[label_names][]", "data-issue-update" => "/root/test/issues/2.json", "data-labels" => "/root/test/labels.json", "data-project-id" => "12", "data-show-any" => "true", "data-show-no" => "true", "data-toggle" => "dropdown", :type => "button"}
+ %button.dropdown-menu-toggle.js-label-select.js-multiselect{ type: "button", data: { ability_name: "issue", field_name: "issue[label_names][]", issue_update: "/root/test/issues/2.json", labels: "/root/test/labels.json", project_id: "12", show_any: "true", show_no: "true", toggle: "dropdown" } }
%span.dropdown-toggle-text
Label
%i.fa.fa-chevron-down