diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-10 12:13:39 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-10 12:13:39 +0300 |
| commit | 99806914a5ca382b22588de722a0db1c7a8bfff6 (patch) | |
| tree | fe530b7edee61bbfe135aadbdf7bd58dcfbd37b0 /app/assets/javascripts | |
| parent | 22f1339d4734674f024c1b1d6a18ed94565175ae (diff) | |
| parent | a4c501756f8710b9d4b7a3501b54be90e1c7fd1f (diff) | |
Merge branch '38869-api' into 'master'
Remove Api from main.js
See merge request gitlab-org/gitlab-ce!14774
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/main.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 853546b617b..974121412bd 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -56,7 +56,6 @@ import './u2f/util'; // everything else import './activities'; import './admin'; -import './api'; import './aside'; import './autosave'; import loadAwardsHandler from './awards_handler'; |