summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2018-01-22 18:34:21 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2018-01-30 09:24:57 -0600
commit449b0ebaf6f3ca65b48f372293117acc9a7e0abc (patch)
tree7a069e1708a82cf989439c80a2f9b1d46e888491 /app/assets/javascripts/pages/projects
parentbfc2b8a3d2c06c80126365348ce75b3985185e83 (diff)
downloadgitlab-ce-449b0ebaf6f3ca65b48f372293117acc9a7e0abc.tar.gz
Restored some code, add hidden class
Diffstat (limited to 'app/assets/javascripts/pages/projects')
-rw-r--r--app/assets/javascripts/pages/projects/show/index.js18
-rw-r--r--app/assets/javascripts/pages/projects/tree/show/index.js5
2 files changed, 5 insertions, 18 deletions
diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js
index 0213b46eb7c..4c42fda16d7 100644
--- a/app/assets/javascripts/pages/projects/show/index.js
+++ b/app/assets/javascripts/pages/projects/show/index.js
@@ -1,4 +1,3 @@
-import Vue from 'vue';
import ShortcutsNavigation from '~/shortcuts_navigation';
import NotificationsForm from '~/notifications_form';
import UserCallout from '~/user_callout';
@@ -26,21 +25,4 @@ export default () => {
$('#tree-slider').waitForImages(() => {
ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath);
});
-
- const commitPipelineStatusEl = document.getElementById('commit-pipeline-status');
- // eslint-disable-next-line no-new
- new Vue({
- el: '#commit-pipeline-status',
- components: {
- commitPipelineStatus,
- },
- render(createElement) {
- return createElement('commit-pipeline-status', {
- props: {
- endpoint: commitPipelineStatusEl.dataset.endpoint,
- realtime: false,
- },
- });
- },
- });
};
diff --git a/app/assets/javascripts/pages/projects/tree/show/index.js b/app/assets/javascripts/pages/projects/tree/show/index.js
index c0b3f98e66d..f14c3f86687 100644
--- a/app/assets/javascripts/pages/projects/tree/show/index.js
+++ b/app/assets/javascripts/pages/projects/tree/show/index.js
@@ -15,6 +15,11 @@ export default () => {
ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath));
const commitPipelineStatusEl = document.getElementById('commit-pipeline-status');
+ const $statusLink = $('.ci-status-link');
+ if ($statusLink.length > 0) {
+ $statusLink.remove();
+ }
+ commitPipelineStatusEl.classList.remove('hidden');
// eslint-disable-next-line no-new
new Vue({
el: '#commit-pipeline-status',