Skip to content

Commit 6d819e2

Browse files
authored
Fix master testing and update eslint-config (#17367)
Fix master testing and update eslint-config
2 parents 7d9a503 + 4293ede commit 6d819e2

36 files changed

+225
-74
lines changed

.drone.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ kind: pipeline
2727
name: webpack-build
2828

2929
steps:
30-
- name: submodules
31-
image: docker:git
32-
commands:
33-
- git submodule update --init
34-
- name: webpack-build
30+
- name: build
3531
image: nextcloudci/node:node-4
3632
commands:
33+
- cd /drone/src
3734
- npm ci
3835
- npm run build
36+
- name: changes
37+
image: nextcloudci/node:node-4
38+
commands:
39+
- cd /drone/src
3940
- git status
4041
- bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && exit 1 )"
4142

apps/settings/js/vue-6.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-6.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-apps-users-management.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#workflowengine .multiselect .multiselect__single {
2+
display: flex;
3+
}
4+
5+
#workflowengine .option__icon {
6+
min-width: 25px;
7+
}
8+
9+
#workflowengine input,
10+
#workflowengine .multiselect {
11+
width: 100%;
12+
}

apps/workflowengine/js/workflowengine.js

Lines changed: 32 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/workflowengine/js/workflowengine.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/workflowengine/src/components/Checks/FileMimeType.vue

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
<!--
2+
- @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
3+
-
4+
- @author Julius Härtl <[email protected]>
5+
-
6+
- @license GNU AGPL version 3 or any later version
7+
-
8+
- This program is free software: you can redistribute it and/or modify
9+
- it under the terms of the GNU Affero General Public License as
10+
- published by the Free Software Foundation, either version 3 of the
11+
- License, or (at your option) any later version.
12+
-
13+
- This program is distributed in the hope that it will be useful,
14+
- but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
- GNU Affero General Public License for more details.
17+
-
18+
- You should have received a copy of the GNU Affero General Public License
19+
- along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
-
21+
-->
22+
123
<template>
224
<div>
325
<Multiselect
@@ -108,5 +130,3 @@ export default {
108130
}
109131
}
110132
</script>
111-
112-
<style scoped src="./../../css/multiselect.css"></style>

apps/workflowengine/src/components/Checks/MultiselectTag/MultiselectTag.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export default {
5656
required: true
5757
},
5858
value: {
59+
type: Array,
5960
default() {
6061
return []
6162
}

0 commit comments

Comments
 (0)