diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-12 12:31:10 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-12 12:31:10 +0000 |
| commit | fb318d2362c04e82096d4e733f473a135fadf631 (patch) | |
| tree | 9b2926374fa157c5683083abccc89f08e499602e | |
| parent | 705220e9d9fc2bcce254a978d1222fea0b91e90a (diff) | |
| parent | ab93f7cc7912e0f07cf5ac4de95afdabffad5138 (diff) | |
| download | gitlab-ce-fb318d2362c04e82096d4e733f473a135fadf631.tar.gz | |
Merge branch 'fj-bumping-gollum-lib-and-gollum-rugged-adapter' into 'master'
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
Closes #47577
See merge request gitlab-org/gitlab-ce!19641
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/git/wiki_spec.rb | 16 |
3 files changed, 23 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4fc5af40ce6..883e580b86b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/changelogs/unreleased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml b/changelogs/unreleased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml new file mode 100644 index 00000000000..3b4d429707f --- /dev/null +++ b/changelogs/unreleased/fj-bumping-gollum-lib-and-gollum-rugged-adapter.yml @@ -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 diff --git a/spec/lib/gitlab/git/wiki_spec.rb b/spec/lib/gitlab/git/wiki_spec.rb index 722d697c28e..35b06b14620 100644 --- a/spec/lib/gitlab/git/wiki_spec.rb +++ b/spec/lib/gitlab/git/wiki_spec.rb @@ -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 |