Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
8ec00fbd
Commit
8ec00fbd
authored
Jul 25, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'khaiql/gitlab-ce-fix/missleading-uri-for-labels-in-merge-requests-and-issues-view'
parents
e5c2fdf7
70ab2f72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG
CHANGELOG
+4
-0
app/views/shared/issuable/_label_page_default.html.haml
app/views/shared/issuable/_label_page_default.html.haml
+1
-1
spec/features/issues/filter_by_labels_spec.rb
spec/features/issues/filter_by_labels_spec.rb
+1
-1
No files found.
CHANGELOG
View file @
8ec00fbd
...
@@ -26,6 +26,10 @@ v 8.10.1
...
@@ -26,6 +26,10 @@ v 8.10.1
- Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page. !5446
- Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page. !5446
- Ignore invalid trusted proxies in X-Forwarded-For header. !5454
- Ignore invalid trusted proxies in X-Forwarded-For header. !5454
- Add links to the real markdown.md file for all GFM examples. !5458
- Add links to the real markdown.md file for all GFM examples. !5458
- Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view' !5368 (Scott Le)
v 8.10.1 (unreleased)
- Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page
v 8.10.0
v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter)
- Fix profile activity heatmap to show correct day name (eanplatter)
...
...
app/views/shared/issuable/_label_page_default.html.haml
View file @
8ec00fbd
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
-
filter_placeholder
=
local_assigns
.
fetch
(
:filter_placeholder
,
'Search labels'
)
-
filter_placeholder
=
local_assigns
.
fetch
(
:filter_placeholder
,
'Search labels'
)
.dropdown-page-one
.dropdown-page-one
=
dropdown_title
(
title
)
=
dropdown_title
(
title
)
=
dropdown_filter
(
filter_placeholder
,
search_id:
"label-name"
)
=
dropdown_filter
(
filter_placeholder
)
=
dropdown_content
=
dropdown_content
-
if
@project
&&
show_footer
-
if
@project
&&
show_footer
=
dropdown_footer
do
=
dropdown_footer
do
...
...
spec/features/issues/filter_by_labels_spec.rb
View file @
8ec00fbd
...
@@ -205,7 +205,7 @@ feature 'Issue filtering by Labels', feature: true do
...
@@ -205,7 +205,7 @@ feature 'Issue filtering by Labels', feature: true do
page
.
within
'.labels-filter'
do
page
.
within
'.labels-filter'
do
click_button
'Label'
click_button
'Label'
wait_for_ajax
wait_for_ajax
fi
ll_in
'label-name'
,
with:
'bug'
fi
nd
(
'.dropdown-input input'
).
set
'bug'
page
.
within
'.dropdown-content'
do
page
.
within
'.dropdown-content'
do
expect
(
page
).
not_to
have_content
'enhancement'
expect
(
page
).
not_to
have_content
'enhancement'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment