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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
171ee26e
Commit
171ee26e
authored
Oct 16, 2019
by
Jeremy Elder
Committed by
Fatih Acet
Oct 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Update issue list icons"
parent
82135aa5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
7 deletions
+16
-7
app/views/projects/issues/import_csv/_button.html.haml
app/views/projects/issues/import_csv/_button.html.haml
+1
-1
app/views/shared/issuable/_feed_buttons.html.haml
app/views/shared/issuable/_feed_buttons.html.haml
+3
-3
changelogs/unreleased/32380-update-issue-list-icons.yml
changelogs/unreleased/32380-update-issue-list-icons.yml
+5
-0
ee/app/views/projects/issues/export_csv/_button.html.haml
ee/app/views/projects/issues/export_csv/_button.html.haml
+1
-1
spec/support/features/rss_shared_examples.rb
spec/support/features/rss_shared_examples.rb
+6
-2
No files found.
app/views/projects/issues/import_csv/_button.html.haml
View file @
171ee26e
...
...
@@ -3,7 +3,7 @@
%button
.csv-import-button.btn
{
title:
_
(
'Import CSV'
),
class:
(
'has-tooltip'
if
type
==
:icon
),
data:
{
toggle:
'modal'
,
target:
'.issues-import-modal'
}
}
-
if
type
==
:icon
=
sprite_icon
(
'
upload
'
)
=
sprite_icon
(
'
import
'
)
-
else
=
_
(
'Import CSV'
)
app/views/shared/issuable/_feed_buttons.html.haml
View file @
171ee26e
=
link_to
safe_params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip'
,
data:
{
container:
'body'
},
title:
_
(
'Subscribe to RSS feed'
)
do
=
icon
(
'rss'
)
=
link_to
safe_params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip
js-rss-button
'
,
data:
{
container:
'body'
},
title:
_
(
'Subscribe to RSS feed'
)
do
=
sprite_
icon
(
'rss'
)
=
link_to
safe_params
.
merge
(
calendar_url_options
),
class:
'btn has-tooltip'
,
data:
{
container:
'body'
},
title:
_
(
'Subscribe to calendar'
)
do
=
custom_icon
(
'icon_
calendar'
)
=
sprite_icon
(
'
calendar'
)
changelogs/unreleased/32380-update-issue-list-icons.yml
0 → 100644
View file @
171ee26e
---
title
:
Use correct icons for issue actions
merge_request
:
author
:
type
:
other
ee/app/views/projects/issues/export_csv/_button.html.haml
View file @
171ee26e
-
if
(
current_user
&&
@project
.
feature_available?
(
:export_issues
))
||
show_promotions?
%button
.csv_download_link.btn.has-tooltip
{
title:
_
(
'Export as CSV'
),
data:
{
toggle:
'modal'
,
target:
'.issues-export-modal'
}
}
=
sprite_icon
(
'
download
'
)
=
sprite_icon
(
'
export
'
)
spec/support/features/rss_shared_examples.rb
View file @
171ee26e
...
...
@@ -8,7 +8,9 @@ end
shared_examples
"it has an RSS button with current_user's feed token"
do
it
"shows the RSS button with current_user's feed token"
do
expect
(
page
).
to
have_css
(
"a:has(.fa-rss)[href*='feed_token=
#{
user
.
feed_token
}
']"
)
expect
(
page
)
.
to
have_css
(
"a:has(.fa-rss)[href*='feed_token=
#{
user
.
feed_token
}
']"
)
.
or
have_css
(
"a.js-rss-button[href*='feed_token=
#{
user
.
feed_token
}
']"
)
end
end
...
...
@@ -20,6 +22,8 @@ end
shared_examples
"it has an RSS button without a feed token"
do
it
"shows the RSS button without a feed token"
do
expect
(
page
).
to
have_css
(
"a:has(.fa-rss):not([href*='feed_token'])"
)
expect
(
page
)
.
to
have_css
(
"a:has(.fa-rss):not([href*='feed_token'])"
)
.
or
have_css
(
"a.js-rss-button:not([href*='feed_token'])"
)
end
end
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