From 80d1ead188815282928762ddcc1bd69ed78f490f Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 21 Dec 2016 11:21:11 +0000
Subject: Resolve conflicts

---
 app/assets/javascripts/dispatcher.js.es6 | 1 +
 1 file changed, 1 insertion(+)

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;
 
-- 
cgit v1.2.1