Commit 442fc4ed authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'

Resolve ""New branch" and "New tag" actions are pointless on an empty repository"

Closes #39988

See merge request gitlab-org/gitlab-ce!16332
parents 2f585071 7034ef29
...@@ -30,12 +30,13 @@ ...@@ -30,12 +30,13 @@
%li %li
= link_to project_new_blob_path(@project, @project.default_branch || 'master') do = link_to project_new_blob_path(@project, @project.default_branch || 'master') do
#{ _('New file') } #{ _('New file') }
%li - unless @project.empty_repo?
= link_to new_project_branch_path(@project) do %li
#{ _('New branch') } = link_to new_project_branch_path(@project) do
%li #{ _('New branch') }
= link_to new_project_tag_path(@project) do %li
#{ _('New tag') } = link_to new_project_tag_path(@project) do
#{ _('New tag') }
- elsif current_user && current_user.already_forked?(@project) - elsif current_user && current_user.already_forked?(@project)
%li %li
= link_to project_new_blob_path(@project, @project.default_branch || 'master') do = link_to project_new_blob_path(@project, @project.default_branch || 'master') do
......
---
title: Hide new branch and tag links for projects with an empty repo
merge_request:
author:
type: fixed
require 'spec_helper'
describe 'projects/buttons/_dropdown' do
let(:user) { create(:user) }
context 'user with all abilities' do
before do
assign(:project, project)
allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:can?).and_return(true)
end
context 'empty repository' do
let(:project) { create(:project, :empty_repo) }
it 'has a link to create a new file' do
render
expect(view).to render_template('projects/buttons/_dropdown')
expect(rendered).to have_link('New file')
end
it 'does not have a link to create a new branch' do
render
expect(view).to render_template('projects/buttons/_dropdown')
expect(rendered).not_to have_link('New branch')
end
it 'does not have a link to create a new tag' do
render
expect(view).to render_template('projects/buttons/_dropdown')
expect(rendered).not_to have_link('New tag')
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment