diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-07-12 11:07:18 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-07-12 11:07:18 +0000 |
commit | 6f8cf37ebeaa0098072df66e556b6c59de531734 (patch) | |
tree | 00c4bd16f5f6d10fd4548862ca8df834d494834c | |
parent | 9e13da029a420bda671a19911db472ffa83d0968 (diff) | |
parent | 26072c1a646d39547c3eaca57b7715b81ce5b177 (diff) | |
download | gitlab-ce-6f8cf37ebeaa0098072df66e556b6c59de531734.tar.gz |
Merge branch 'sh-optimize-wiki-empty-check' into 'master'
Optimize ProjectWiki#empty? check
See merge request gitlab-org/gitlab-ce!20573
-rw-r--r-- | app/models/project_wiki.rb | 5 | ||||
-rw-r--r-- | changelogs/unreleased/sh-optimize-wiki-empty-check.yml | 5 | ||||
-rw-r--r-- | spec/models/project_wiki_spec.rb | 10 |
3 files changed, 18 insertions, 2 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index fc868c3ebb7..9ae2fb0013a 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -20,7 +20,6 @@ class ProjectWiki @user = user end - delegate :empty?, to: :pages delegate :repository_storage, :hashed_storage?, to: :project def path @@ -74,6 +73,10 @@ class ProjectWiki !!find_page('home') end + def empty? + pages(limit: 1).empty? + end + # Returns an Array of Gitlab WikiPage instances or an # empty Array if this Wiki has no pages. def pages(limit: nil) diff --git a/changelogs/unreleased/sh-optimize-wiki-empty-check.yml b/changelogs/unreleased/sh-optimize-wiki-empty-check.yml new file mode 100644 index 00000000000..31ca7497b5a --- /dev/null +++ b/changelogs/unreleased/sh-optimize-wiki-empty-check.yml @@ -0,0 +1,5 @@ +--- +title: Optimize ProjectWiki#empty? check +merge_request: 20573 +author: +type: performance diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb index a3c20b3b3c1..a544940800a 100644 --- a/spec/models/project_wiki_spec.rb +++ b/spec/models/project_wiki_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require "spec_helper" describe ProjectWiki do @@ -10,7 +11,6 @@ describe ProjectWiki do subject { project_wiki } - it { is_expected.to delegate_method(:empty?).to :pages } it { is_expected.to delegate_method(:repository_storage).to :project } it { is_expected.to delegate_method(:hashed_storage?).to :project } @@ -92,11 +92,19 @@ describe ProjectWiki do context "when the wiki has pages" do before do project_wiki.create_page("index", "This is an awesome new Gollum Wiki") + project_wiki.create_page("another-page", "This is another page") end describe '#empty?' do subject { super().empty? } it { is_expected.to be_falsey } + + # Re-enable this when https://gitlab.com/gitlab-org/gitaly/issues/1204 is fixed + xit 'only instantiates a Wiki page once' do + expect(WikiPage).to receive(:new).once.and_call_original + + subject + end end end end |