Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
80de2bab
Commit
80de2bab
authored
Dec 06, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'disable-attachment-epic' into 'master'"
parent
4c25ecfd
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1 addition
and
66 deletions
+1
-66
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+0
-1
app/assets/javascripts/issue_show/components/fields/description.vue
.../javascripts/issue_show/components/fields/description.vue
+0
-6
app/assets/javascripts/issue_show/components/form.vue
app/assets/javascripts/issue_show/components/form.vue
+0
-6
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+0
-6
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
...ts/javascripts/vue_shared/components/markdown/toolbar.vue
+1
-9
ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue
.../javascripts/epics/epic_show/components/epic_show_app.vue
+0
-1
spec/javascripts/vue_shared/components/markdown/toolbar_spec.js
...avascripts/vue_shared/components/markdown/toolbar_spec.js
+0
-37
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
80de2bab
...
@@ -248,7 +248,6 @@ export default {
...
@@ -248,7 +248,6 @@ export default {
:project-path=
"projectPath"
:project-path=
"projectPath"
:project-namespace=
"projectNamespace"
:project-namespace=
"projectNamespace"
:show-delete-button=
"showDeleteButton"
:show-delete-button=
"showDeleteButton"
:can-attach-file=
"canAttachFile"
:enable-autocomplete=
"enableAutocomplete"
:enable-autocomplete=
"enableAutocomplete"
/>
/>
<div
v-else
>
<div
v-else
>
...
...
app/assets/javascripts/issue_show/components/fields/description.vue
View file @
80de2bab
...
@@ -17,11 +17,6 @@
...
@@ -17,11 +17,6 @@
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
canAttachFile
:
{
type
:
Boolean
,
required
:
false
,
default
:
true
,
},
enableAutocomplete
:
{
enableAutocomplete
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
...
@@ -47,7 +42,6 @@
...
@@ -47,7 +42,6 @@
<markdown-field
<markdown-field
:markdown-preview-path=
"markdownPreviewPath"
:markdown-preview-path=
"markdownPreviewPath"
:markdown-docs-path=
"markdownDocsPath"
:markdown-docs-path=
"markdownDocsPath"
:can-attach-file=
"canAttachFile"
:enable-autocomplete=
"enableAutocomplete"
:enable-autocomplete=
"enableAutocomplete"
>
>
<textarea
<textarea
...
...
app/assets/javascripts/issue_show/components/form.vue
View file @
80de2bab
...
@@ -41,11 +41,6 @@
...
@@ -41,11 +41,6 @@
required
:
false
,
required
:
false
,
default
:
true
,
default
:
true
,
},
},
canAttachFile
:
{
type
:
Boolean
,
required
:
false
,
default
:
true
,
},
enableAutocomplete
:
{
enableAutocomplete
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
...
@@ -94,7 +89,6 @@
...
@@ -94,7 +89,6 @@
:form-state=
"formState"
:form-state=
"formState"
:markdown-preview-path=
"markdownPreviewPath"
:markdown-preview-path=
"markdownPreviewPath"
:markdown-docs-path=
"markdownDocsPath"
:markdown-docs-path=
"markdownDocsPath"
:can-attach-file=
"canAttachFile"
:enable-autocomplete=
"enableAutocomplete"
:enable-autocomplete=
"enableAutocomplete"
/>
/>
<edit-actions
<edit-actions
...
...
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
80de2bab
...
@@ -25,11 +25,6 @@
...
@@ -25,11 +25,6 @@
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
},
},
canAttachFile
:
{
type
:
Boolean
,
required
:
false
,
default
:
true
,
},
enableAutocomplete
:
{
enableAutocomplete
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
...
@@ -139,7 +134,6 @@
...
@@ -139,7 +134,6 @@
<markdown-toolbar
<markdown-toolbar
:markdown-docs-path=
"markdownDocsPath"
:markdown-docs-path=
"markdownDocsPath"
:quick-actions-docs-path=
"quickActionsDocsPath"
:quick-actions-docs-path=
"quickActionsDocsPath"
:can-attach-file=
"canAttachFile"
/>
/>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
View file @
80de2bab
...
@@ -9,11 +9,6 @@
...
@@ -9,11 +9,6 @@
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
},
},
canAttachFile
:
{
type
:
Boolean
,
required
:
false
,
default
:
true
,
},
},
},
};
};
</
script
>
</
script
>
...
@@ -46,10 +41,7 @@
...
@@ -46,10 +41,7 @@
are supported
are supported
</
template
>
</
template
>
</div>
</div>
<span
<span
class=
"uploading-container"
>
v-if=
"canAttachFile"
class=
"uploading-container"
>
<span
class=
"uploading-progress-container hide"
>
<span
class=
"uploading-progress-container hide"
>
<i
<i
class=
"fa fa-file-image-o toolbar-button-icon"
class=
"fa fa-file-image-o toolbar-button-icon"
...
...
ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue
View file @
80de2bab
...
@@ -128,7 +128,6 @@
...
@@ -128,7 +128,6 @@
:project-namespace=
"projectNamespace"
:project-namespace=
"projectNamespace"
:show-inline-edit-button=
"true"
:show-inline-edit-button=
"true"
:show-delete-button=
"false"
:show-delete-button=
"false"
:can-attach-file=
"false"
:enable-autocomplete=
"false"
:enable-autocomplete=
"false"
/>
/>
</div>
</div>
...
...
spec/javascripts/vue_shared/components/markdown/toolbar_spec.js
deleted
100644 → 0
View file @
4c25ecfd
import
Vue
from
'
vue
'
;
import
toolbar
from
'
~/vue_shared/components/markdown/toolbar.vue
'
;
import
mountComponent
from
'
../../../helpers/vue_mount_component_helper
'
;
describe
(
'
toolbar
'
,
()
=>
{
let
vm
;
const
Toolbar
=
Vue
.
extend
(
toolbar
);
const
props
=
{
markdownDocsPath
:
''
,
};
afterEach
(()
=>
{
vm
.
$destroy
();
});
describe
(
'
user can attach file
'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
Toolbar
,
props
);
});
it
(
'
should render uploading-container
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.uploading-container
'
)).
not
.
toBeNull
();
});
});
describe
(
'
user cannot attach file
'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
Toolbar
,
Object
.
assign
({},
props
,
{
canAttachFile
:
false
,
}));
});
it
(
'
should not render uploading-container
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.uploading-container
'
)).
toBeNull
();
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment