diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-11-11 22:57:23 +0000 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-11-11 22:57:23 +0000 |
commit | 062c9a08c44f2e178476cace0ebd8a55aa27e866 (patch) | |
tree | c908b63b39dab76b5a6058023dea543bd7ee88bd | |
parent | 0527ea09920d49bb9e1574e7a61958ba70dbe24e (diff) | |
download | gitlab-ce-062c9a08c44f2e178476cace0ebd8a55aa27e866.tar.gz |
change empty project view to annonymous user from activity to empty partial
-rw-r--r-- | app/helpers/preferences_helper.rb | 8 | ||||
-rw-r--r-- | app/models/repository.rb | 2 | ||||
-rw-r--r-- | app/views/projects/_empty.html.haml | 3 | ||||
-rw-r--r-- | spec/helpers/preferences_helper_spec.rb | 9 |
4 files changed, 11 insertions, 11 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index a721f8957cb..f7189e0c5a1 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -50,9 +50,7 @@ module PreferencesHelper end def default_project_view - unless current_user - return @repository.head_commit ? 'readme' : 'activity' - end + return annonymous_project_view unless current_user user_view = current_user.project_view @@ -68,4 +66,8 @@ module PreferencesHelper "customize_workflow" end end + + def annonymous_project_view + @project.empty_repo? ? 'empty' : 'readme' + end end diff --git a/app/models/repository.rb b/app/models/repository.rb index 12748fe5d76..063dc74021d 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -554,8 +554,6 @@ class Repository end def readme - return unless head_commit - cache.fetch(:readme) { tree(:head).readme } end diff --git a/app/views/projects/_empty.html.haml b/app/views/projects/_empty.html.haml new file mode 100644 index 00000000000..0e4f73cbefc --- /dev/null +++ b/app/views/projects/_empty.html.haml @@ -0,0 +1,3 @@ +.row-content-block.second-block.center + %h3.page-title + The repository for this project is empty diff --git a/spec/helpers/preferences_helper_spec.rb b/spec/helpers/preferences_helper_spec.rb index 3830fe26158..2bd4eace89f 100644 --- a/spec/helpers/preferences_helper_spec.rb +++ b/spec/helpers/preferences_helper_spec.rb @@ -90,19 +90,16 @@ describe PreferencesHelper do let(:project) { create(:project) } context 'user not signed in' do - before do - stub_user - @repository = project.repository - end + before { stub_user } it 'returns readme view if repository is not empty' do expect(helper.default_project_view).to eq('readme') end it 'returns activity if repository is empty' do - expect(@repository).to receive(:head_commit).and_return(nil) + expect(project).to receive(:empty_repo?).and_return(true) - expect(helper.default_project_view).to eq('activity') + expect(helper.default_project_view).to eq('empty') end end end |