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
Boxiang Sun
gitlab-ce
Commits
b4267aaa
Commit
b4267aaa
authored
Jun 25, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update external link icon in merge request widget
parent
87f7597a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
...cripts/vue_merge_request_widget/components/deployment.vue
+6
-5
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
changelogs/unreleased/update-external-link-icon-in-merge-request-widget.yml
...sed/update-external-link-icon-in-merge-request-widget.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
View file @
b4267aaa
<
script
>
<
script
>
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
timeagoMixin
from
'
../../vue_shared/mixins/timeago
'
;
import
timeagoMixin
from
'
../../vue_shared/mixins/timeago
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
LoadingButton
from
'
../../vue_shared/components/loading_button.vue
'
;
import
LoadingButton
from
'
../../vue_shared/components/loading_button.vue
'
;
...
@@ -14,6 +15,7 @@ export default {
...
@@ -14,6 +15,7 @@ export default {
LoadingButton
,
LoadingButton
,
MemoryUsage
,
MemoryUsage
,
StatusIcon
,
StatusIcon
,
Icon
,
},
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
...
@@ -110,11 +112,10 @@ export default {
...
@@ -110,11 +112,10 @@ export default {
class=
"deploy-link js-deploy-url"
class=
"deploy-link js-deploy-url"
>
>
{{
deployment
.
external_url_formatted
}}
{{
deployment
.
external_url_formatted
}}
<i
<icon
class=
"fa fa-external-link"
:size=
"16"
aria-hidden=
"true"
name=
"external-link"
>
/>
</i>
</a>
</a>
</
template
>
</
template
>
<span
<span
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
b4267aaa
...
@@ -737,6 +737,10 @@
...
@@ -737,6 +737,10 @@
>
*
:not
(
:last-child
)
{
>
*
:not
(
:last-child
)
{
margin-right
:
.3em
;
margin-right
:
.3em
;
}
}
svg
{
vertical-align
:
text-top
;
}
}
}
.deploy-link
{
.deploy-link
{
...
...
changelogs/unreleased/update-external-link-icon-in-merge-request-widget.yml
0 → 100644
View file @
b4267aaa
---
title
:
Update external link icon in merge request widget
merge_request
:
20154
author
:
George Tsiolis
type
:
changed
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