Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
This commit is contained in:
parent
705220e9d9
commit
ab93f7cc79
3 changed files with 23 additions and 2 deletions
|
@ -296,7 +296,7 @@ GEM
|
||||||
flowdock (~> 0.7)
|
flowdock (~> 0.7)
|
||||||
gitlab-grit (>= 2.4.1)
|
gitlab-grit (>= 2.4.1)
|
||||||
multi_json
|
multi_json
|
||||||
gitlab-gollum-lib (4.2.7.2)
|
gitlab-gollum-lib (4.2.7.4)
|
||||||
gemojione (~> 3.2)
|
gemojione (~> 3.2)
|
||||||
github-markup (~> 1.6)
|
github-markup (~> 1.6)
|
||||||
gollum-grit_adapter (~> 1.0)
|
gollum-grit_adapter (~> 1.0)
|
||||||
|
@ -304,7 +304,7 @@ GEM
|
||||||
rouge (~> 3.1)
|
rouge (~> 3.1)
|
||||||
sanitize (~> 2.1)
|
sanitize (~> 2.1)
|
||||||
stringex (~> 2.6)
|
stringex (~> 2.6)
|
||||||
gitlab-gollum-rugged_adapter (0.4.4)
|
gitlab-gollum-rugged_adapter (0.4.4.1)
|
||||||
mime-types (>= 1.15)
|
mime-types (>= 1.15)
|
||||||
rugged (~> 0.25)
|
rugged (~> 0.25)
|
||||||
gitlab-grit (2.8.2)
|
gitlab-grit (2.8.2)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fixed bug that allowed to remove other wiki pages if the title had wildcard characters
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -25,6 +25,22 @@ describe Gitlab::Git::Wiki do
|
||||||
end
|
end
|
||||||
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)
|
def create_page(name, content)
|
||||||
subject.write_page(name, :markdown, content, commit_details(name))
|
subject.write_page(name, :markdown, content, commit_details(name))
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue