summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/main.js
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-11-20 16:49:14 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-11-20 16:49:14 +0000
commit7a61a8e09bcab5e0cb37ddb13900a5c07ef18918 (patch)
tree54a0411c500614ecdbd309cf1cec1aa1d46e6dd6 /app/assets/javascripts/main.js
parent026ab92ad057bc69af78035582bc0dc147bcec30 (diff)
parentf494dbc51592766317718c4d656d2b74f9fcb3ab (diff)
downloadgitlab-ce-7a61a8e09bcab5e0cb37ddb13900a5c07ef18918.tar.gz
Merge branch '39167-async-boards-sidebar' into 'master'
Make Issue Boards sidebar subscriptions async Closes #39167 and #40094 See merge request gitlab-org/gitlab-ce!15364
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r--app/assets/javascripts/main.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index f97c95a9d9f..601ab90bb30 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -79,7 +79,6 @@ import './right_sidebar';
import './search';
import './search_autocomplete';
import './smart_interval';
-import './subscription';
import './subscription_select';
import initBreadcrumbs from './breadcrumb';