diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 00:29:08 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 00:29:08 +0800 |
commit | 33deaaf3061bccba7bcaf591aaf9d0dc025f1e6e (patch) | |
tree | 6e1e6d413401be10733585f57dadca25f7cae8e1 | |
parent | 34eea29511b9730fdab0316573d26d864d0f1e98 (diff) | |
download | gitlab-ce-33deaaf3061bccba7bcaf591aaf9d0dc025f1e6e.tar.gz |
Remove tooltip from API and vue, follow up:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30511
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/components/status.js | 7 | ||||
-rw-r--r-- | app/serializers/pipeline_entity.rb | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/components/status.js b/app/assets/javascripts/vue_pipelines_index/components/status.js index ece1ec89f89..21a281af438 100644 --- a/app/assets/javascripts/vue_pipelines_index/components/status.js +++ b/app/assets/javascripts/vue_pipelines_index/components/status.js @@ -36,7 +36,7 @@ export default { computed: { cssClasses() { - return `ci-status ci-${this.pipeline.details.status.group} has-tooltip`; + return `ci-status ci-${this.pipeline.details.status.group}`; }, detailsPath() { @@ -47,17 +47,12 @@ export default { content() { return `${this.svg} ${this.pipeline.details.status.text}`; }, - - tooltipTitle() { - return this.pipeline.details.status_tooltip; - }, }, template: ` <td class="commit-link"> <a :class="cssClasses" :href="detailsPath" - :title="tooltipTitle" v-html="content"> </a> </td> diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb index 78af8b51709..3f16dd66d54 100644 --- a/app/serializers/pipeline_entity.rb +++ b/app/serializers/pipeline_entity.rb @@ -13,7 +13,6 @@ class PipelineEntity < Grape::Entity expose :details do expose :detailed_status, as: :status, with: StatusEntity - expose :status_tooltip expose :duration expose :finished_at expose :stages, using: StageEntity @@ -82,8 +81,4 @@ class PipelineEntity < Grape::Entity def detailed_status pipeline.detailed_status(request.user) end - - def status_tooltip - pipeline.present(current_user: request.user).status_title - end end |