summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-08-30 16:57:18 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-08-30 16:57:18 +0000
commit9c491bc628f5a72424b82bb01e2457150bf2e71c (patch)
tree0de00d5d63362aa4b84704d65390b924589d00cc /app
parentf2272c1551a662a089e96fe3aecaeb7b7269012f (diff)
parent3a283fa861451a2061c925dbc2d5a480325aecc8 (diff)
downloadgitlab-ce-9c491bc628f5a72424b82bb01e2457150bf2e71c.tar.gz
Merge branch 'ide-multiple-file-uploads' into 'master'
Enabled multiple uploads in the Web IDE Closes #50405 See merge request gitlab-org/gitlab-ce!21412
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/ide/components/new_dropdown/upload.vue8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/upload.vue b/app/assets/javascripts/ide/components/new_dropdown/upload.vue
index 5b1743bb30e..e2be805ed22 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/upload.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/upload.vue
@@ -24,12 +24,6 @@ export default {
default: null,
},
},
- mounted() {
- this.$refs.fileUpload.addEventListener('change', this.openFile);
- },
- beforeDestroy() {
- this.$refs.fileUpload.removeEventListener('change', this.openFile);
- },
methods: {
createFile(target, file, isText) {
const { name } = file;
@@ -85,6 +79,8 @@ export default {
ref="fileUpload"
type="file"
class="hidden"
+ multiple
+ @change="openFile"
/>
</div>
</template>