diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-06 17:09:47 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-06 17:09:47 +0000 |
| commit | b1ad5c186066f11c21ef165957f6e6c8350b4275 (patch) | |
| tree | 5e11a94e60e6d1c28590e0cbed3ffc49799e709f /app/assets/javascripts/main.js | |
| parent | 739e797575d47ec796206865c4d82917cb2ad93d (diff) | |
| parent | b7c480d7c010ec9dd8e0aa470f8a8010f1f4e6ba (diff) | |
| download | gitlab-ce-b1ad5c186066f11c21ef165957f6e6c8350b4275.tar.gz | |
Merge branch 'master' into 'add-index-for-auto_canceled_by_id-mysql'add-index-for-auto_canceled_by_id-mysql
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/assets/javascripts/main.js')
| -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 be3c2c9fbb1..1b0d5fc92e3 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -158,7 +158,6 @@ import './single_file_diff'; import './smart_interval'; import './snippets_list'; import './star'; -import './subbable_resource'; import './subscription'; import './subscription_select'; import './syntax_highlight'; |