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
Léo-Paul Géneau
gitlab-ce
Commits
093690d0
Commit
093690d0
authored
Aug 14, 2018
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update MR deployment to use .label-truncate with .deploy-link
parent
df567ddb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
...cripts/vue_merge_request_widget/components/deployment.vue
+15
-7
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+3
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
View file @
093690d0
<
script
>
<
script
>
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.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
'
;
...
@@ -16,6 +17,7 @@ export default {
...
@@ -16,6 +17,7 @@ export default {
MemoryUsage
,
MemoryUsage
,
StatusIcon
,
StatusIcon
,
Icon
,
Icon
,
TooltipOnTruncate
,
},
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
...
@@ -88,14 +90,20 @@ export default {
...
@@ -88,14 +90,20 @@ export default {
<span>
<span>
Deployed to
Deployed to
</span>
</span>
<a
<tooltip-on-truncate
:href=
"deployment.url"
:title=
"deployment.name"
target=
"_blank"
truncate-target=
"child"
rel=
"noopener noreferrer nofollow"
class=
"deploy-link label-truncate"
class=
"deploy-link js-deploy-meta"
>
>
{{
deployment
.
name
}}
<a
</a>
:href=
"deployment.url"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
class=
"js-deploy-meta"
>
{{
deployment
.
name
}}
</a>
</tooltip-on-truncate>
</
template
>
</
template
>
<span
<span
v-tooltip
v-tooltip
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
093690d0
...
@@ -237,7 +237,10 @@
...
@@ -237,7 +237,10 @@
font-weight
:
normal
;
font-weight
:
normal
;
overflow
:
hidden
;
overflow
:
hidden
;
word-break
:
break-all
;
word-break
:
break-all
;
}
.deploy-link
,
.label-branch
{
&
.label-truncate
{
&
.label-truncate
{
// NOTE: This selector targets its children because some of the HTML comes from
// NOTE: This selector targets its children because some of the HTML comes from
// 'source_branch_link'. Once this external HTML is no longer used, we could
// 'source_branch_link'. Once this external HTML is no longer used, we could
...
...
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