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
fe7e1818
Commit
fe7e1818
authored
May 07, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed linit errors
parent
6948b56c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
...pts/pages/projects/wikis/components/delete_wiki_modal.vue
+18
-18
app/views/projects/wikis/edit.html.haml
app/views/projects/wikis/edit.html.haml
+4
-4
spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
+1
-1
No files found.
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
View file @
fe7e1818
...
@@ -34,7 +34,7 @@ export default {
...
@@ -34,7 +34,7 @@ export default {
{
{
pageTitle
:
`'
${
_
.
escape
(
this
.
pageTitle
)}
'`
,
pageTitle
:
`'
${
_
.
escape
(
this
.
pageTitle
)}
'`
,
},
},
false
false
,
);
);
},
},
},
},
...
@@ -56,22 +56,22 @@ export default {
...
@@ -56,22 +56,22 @@ export default {
>
>
{{
message
}}
{{
message
}}
<form
<form
ref=
"form"
ref=
"form"
:action=
"deleteWikiUrl"
:action=
"deleteWikiUrl"
method=
"post"
method=
"post"
class=
"form-horizontal js-requires-input"
class=
"form-horizontal js-requires-input"
>
>
<input
<input
ref=
"method"
ref=
"method"
type=
"hidden"
type=
"hidden"
name=
"_method"
name=
"_method"
value=
"delete"
value=
"delete"
/>
/>
<input
<input
type=
"hidden"
type=
"hidden"
name=
"authenticity_token"
name=
"authenticity_token"
:value=
"csrfToken"
:value=
"csrfToken"
/>
/>
</form>
</form>
</gl-modal>
</gl-modal>
</
template
>
</
template
>
app/views/projects/wikis/edit.html.haml
View file @
fe7e1818
...
@@ -28,10 +28,10 @@
...
@@ -28,10 +28,10 @@
=
link_to
project_wiki_history_path
(
@project
,
@page
),
class:
"btn"
do
=
link_to
project_wiki_history_path
(
@project
,
@page
),
class:
"btn"
do
=
s_
(
"Wiki|Page history"
)
=
s_
(
"Wiki|Page history"
)
-
if
can?
(
current_user
,
:admin_wiki
,
@project
)
-
if
can?
(
current_user
,
:admin_wiki
,
@project
)
%button
.btn.btn-danger
{
data:
{
toggle:
'modal'
,
%button
.btn.btn-danger
{
data:
{
toggle:
'modal'
,
target:
'#delete-wiki-modal'
,
target:
'#delete-wiki-modal'
,
delete_wiki_url:
project_wiki_path
(
@project
,
@page
),
delete_wiki_url:
project_wiki_path
(
@project
,
@page
),
page_title:
@page
.
title
.
capitalize
},
page_title:
@page
.
title
.
capitalize
},
id:
'delete-wiki-button'
,
id:
'delete-wiki-button'
,
type:
'button'
}
type:
'button'
}
=
_
(
'Delete'
)
=
_
(
'Delete'
)
...
...
spec/features/projects/wiki/user_deletes_wiki_page_spec.rb
View file @
fe7e1818
...
@@ -14,7 +14,7 @@ feature 'User deletes wiki page', :js do
...
@@ -14,7 +14,7 @@ feature 'User deletes wiki page', :js do
click_on
(
'Edit'
)
click_on
(
'Edit'
)
click_on
(
'Delete'
)
click_on
(
'Delete'
)
find
(
'.js-modal-primary-action'
).
click
find
(
'.js-modal-primary-action'
).
click
expect
(
page
).
to
have_content
(
'Page was successfully deleted'
)
expect
(
page
).
to
have_content
(
'Page was successfully deleted'
)
end
end
end
end
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