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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
ab93f7cc
Commit
ab93f7cc
authored
Jun 12, 2018
by
Francisco Javier López
Committed by
Douwe Maan
Jun 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
parent
705220e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
2 deletions
+23
-2
Gemfile.lock
Gemfile.lock
+2
-2
changelogs/unreleased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml
...eased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml
+5
-0
spec/lib/gitlab/git/wiki_spec.rb
spec/lib/gitlab/git/wiki_spec.rb
+16
-0
No files found.
Gemfile.lock
View file @
ab93f7cc
...
...
@@ -296,7 +296,7 @@ GEM
flowdock (~> 0.7)
gitlab-grit (>= 2.4.1)
multi_json
gitlab-gollum-lib (4.2.7.
2
)
gitlab-gollum-lib (4.2.7.
4
)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
...
...
@@ -304,7 +304,7 @@ GEM
rouge (~> 3.1)
sanitize (~> 2.1)
stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4)
gitlab-gollum-rugged_adapter (0.4.4
.1
)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-grit (2.8.2)
...
...
changelogs/unreleased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml
0 → 100644
View file @
ab93f7cc
---
title
:
Fixed bug that allowed to remove other wiki pages if the title had wildcard characters
merge_request
:
author
:
type
:
fixed
spec/lib/gitlab/git/wiki_spec.rb
View file @
ab93f7cc
...
...
@@ -25,6 +25,22 @@ describe Gitlab::Git::Wiki do
end
end
describe
'#delete_page'
,
:skip_gitaly_mock
do
after
do
destroy_page
(
'page1'
)
end
it
'only removes the page with the same path'
do
create_page
(
'page1'
,
'content'
)
create_page
(
'*'
,
'content'
)
subject
.
delete_page
(
'*'
,
commit_details
(
'whatever'
))
expect
(
subject
.
pages
.
count
).
to
eq
1
expect
(
subject
.
pages
.
first
.
title
).
to
eq
'page1'
end
end
def
create_page
(
name
,
content
)
subject
.
write_page
(
name
,
:markdown
,
content
,
commit_details
(
name
))
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