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
33deaaf3
Commit
33deaaf3
authored
Apr 06, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove tooltip from API and vue, follow up:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30511
parent
34eea295
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
11 deletions
+1
-11
app/assets/javascripts/vue_pipelines_index/components/status.js
...sets/javascripts/vue_pipelines_index/components/status.js
+1
-6
app/serializers/pipeline_entity.rb
app/serializers/pipeline_entity.rb
+0
-5
No files found.
app/assets/javascripts/vue_pipelines_index/components/status.js
View file @
33deaaf3
...
@@ -36,7 +36,7 @@ export default {
...
@@ -36,7 +36,7 @@ export default {
computed
:
{
computed
:
{
cssClasses
()
{
cssClasses
()
{
return
`ci-status ci-
${
this
.
pipeline
.
details
.
status
.
group
}
has-tooltip
`
;
return
`ci-status ci-
${
this
.
pipeline
.
details
.
status
.
group
}
`
;
},
},
detailsPath
()
{
detailsPath
()
{
...
@@ -47,17 +47,12 @@ export default {
...
@@ -47,17 +47,12 @@ export default {
content
()
{
content
()
{
return
`
${
this
.
svg
}
${
this
.
pipeline
.
details
.
status
.
text
}
`
;
return
`
${
this
.
svg
}
${
this
.
pipeline
.
details
.
status
.
text
}
`
;
},
},
tooltipTitle
()
{
return
this
.
pipeline
.
details
.
status_tooltip
;
},
},
},
template
:
`
template
:
`
<td class="commit-link">
<td class="commit-link">
<a
<a
:class="cssClasses"
:class="cssClasses"
:href="detailsPath"
:href="detailsPath"
:title="tooltipTitle"
v-html="content">
v-html="content">
</a>
</a>
</td>
</td>
...
...
app/serializers/pipeline_entity.rb
View file @
33deaaf3
...
@@ -13,7 +13,6 @@ class PipelineEntity < Grape::Entity
...
@@ -13,7 +13,6 @@ class PipelineEntity < Grape::Entity
expose
:details
do
expose
:details
do
expose
:detailed_status
,
as: :status
,
with:
StatusEntity
expose
:detailed_status
,
as: :status
,
with:
StatusEntity
expose
:status_tooltip
expose
:duration
expose
:duration
expose
:finished_at
expose
:finished_at
expose
:stages
,
using:
StageEntity
expose
:stages
,
using:
StageEntity
...
@@ -82,8 +81,4 @@ class PipelineEntity < Grape::Entity
...
@@ -82,8 +81,4 @@ class PipelineEntity < Grape::Entity
def
detailed_status
def
detailed_status
pipeline
.
detailed_status
(
request
.
user
)
pipeline
.
detailed_status
(
request
.
user
)
end
end
def
status_tooltip
pipeline
.
present
(
current_user:
request
.
user
).
status_title
end
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