summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-12-21 11:21:11 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-12-21 11:21:11 +0000
commit80d1ead188815282928762ddcc1bd69ed78f490f (patch)
treeca5fc651642a1f6c6daf9d0a385542e92c10c704 /app
parent8db9888ffcfc98a1ceb8ea2592014522df927c4d (diff)
downloadgitlab-ce-80d1ead188815282928762ddcc1bd69ed78f490f.tar.gz
Resolve conflicts23638-remove-builds-tab
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/dispatcher.js.es61
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6
index 14b37c6e412..5245c5aa494 100644
--- a/app/assets/javascripts/dispatcher.js.es6
+++ b/app/assets/javascripts/dispatcher.js.es6
@@ -183,6 +183,7 @@
container: '.js-pipeline-table',
});
break;
+ case 'projects:pipelines:builds':
case 'projects:pipelines:show':
const { controllerAction } = document.querySelector('.js-pipeline-container').dataset;