Hides merge request button on branches page
If user does not have the correct permissions, the merge request button is hidden Closes #21805
This commit is contained in:
parent
a5d1428a91
commit
315e6392cd
3 changed files with 35 additions and 19 deletions
|
@ -18,6 +18,7 @@ v 8.12.0 (unreleased)
|
||||||
- Shorten task status phrase (ClemMakesApps)
|
- Shorten task status phrase (ClemMakesApps)
|
||||||
- Add hover color to emoji icon (ClemMakesApps)
|
- Add hover color to emoji icon (ClemMakesApps)
|
||||||
- Fix branches page dropdown sort alignment (ClemMakesApps)
|
- Fix branches page dropdown sort alignment (ClemMakesApps)
|
||||||
|
- Hides merge request button on branches page is user doesn't have permissions
|
||||||
- Add white background for no readme container (ClemMakesApps)
|
- Add white background for no readme container (ClemMakesApps)
|
||||||
- API: Expose issue confidentiality flag. (Robert Schilling)
|
- API: Expose issue confidentiality flag. (Robert Schilling)
|
||||||
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
|
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
- diverging_commit_counts = @repository.diverging_commit_counts(branch)
|
- diverging_commit_counts = @repository.diverging_commit_counts(branch)
|
||||||
- number_commits_behind = diverging_commit_counts[:behind]
|
- number_commits_behind = diverging_commit_counts[:behind]
|
||||||
- number_commits_ahead = diverging_commit_counts[:ahead]
|
- number_commits_ahead = diverging_commit_counts[:ahead]
|
||||||
|
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
|
||||||
%li(class="js-branch-#{branch.name}")
|
%li(class="js-branch-#{branch.name}")
|
||||||
%div
|
%div
|
||||||
= link_to namespace_project_tree_path(@project.namespace, @project, branch.name), class: 'item-title str-truncated' do
|
= link_to namespace_project_tree_path(@project.namespace, @project, branch.name), class: 'item-title str-truncated' do
|
||||||
|
@ -19,12 +20,12 @@
|
||||||
%i.fa.fa-lock
|
%i.fa.fa-lock
|
||||||
protected
|
protected
|
||||||
.controls.hidden-xs
|
.controls.hidden-xs
|
||||||
- if create_mr_button?(@repository.root_ref, branch.name)
|
- if merge_project && create_mr_button?(@repository.root_ref, branch.name)
|
||||||
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
|
= link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
|
||||||
Merge Request
|
Merge Request
|
||||||
|
|
||||||
- if branch.name != @repository.root_ref
|
- if branch.name != @repository.root_ref
|
||||||
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-default', method: :post, title: "Compare" do
|
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: "btn btn-default #{'prepend-left-10' unless merge_project}", method: :post, title: "Compare" do
|
||||||
Compare
|
Compare
|
||||||
|
|
||||||
= render 'projects/buttons/download', project: @project, ref: branch.name
|
= render 'projects/buttons/download', project: @project, ref: branch.name
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'Branches', feature: true do
|
describe 'Branches', feature: true do
|
||||||
let(:project) { create(:project) }
|
let(:project) { create(:project, :public) }
|
||||||
let(:repository) { project.repository }
|
let(:repository) { project.repository }
|
||||||
|
|
||||||
|
context 'logged in' do
|
||||||
before do
|
before do
|
||||||
login_as :user
|
login_as :user
|
||||||
project.team << [@user, :developer]
|
project.team << [@user, :developer]
|
||||||
|
@ -29,4 +30,17 @@ describe 'Branches', feature: true do
|
||||||
expect(find('.all-branches')).to have_selector('li', count: 1)
|
expect(find('.all-branches')).to have_selector('li', count: 1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'logged out' do
|
||||||
|
before do
|
||||||
|
visit namespace_project_branches_path(project.namespace, project)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not show merge request button' do
|
||||||
|
page.within first('.all-branches li') do
|
||||||
|
expect(page).not_to have_content 'Merge Request'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue