Only show branches for revert / cherry-pick
Tags are immutable, so we can't add a commit to either revert or cherry-pick another commit to them.
This commit is contained in:
parent
747a167a2d
commit
b997752539
|
@ -8,6 +8,7 @@ v 8.9.0 (unreleased)
|
||||||
- Bump rouge to 1.11.0
|
- Bump rouge to 1.11.0
|
||||||
- Make EmailsOnPushWorker use Sidekiq mailers queue
|
- Make EmailsOnPushWorker use Sidekiq mailers queue
|
||||||
- Fix wiki page events' webhook to point to the wiki repository
|
- Fix wiki page events' webhook to point to the wiki repository
|
||||||
|
- Don't show tags for revert and cherry-pick operations
|
||||||
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
|
- Fix issue todo not remove when leave project !4150 (Long Nguyen)
|
||||||
- Allow customisable text on the 'nearly there' page after a user signs up
|
- Allow customisable text on the 'nearly there' page after a user signs up
|
||||||
- Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
|
- Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
|
||||||
|
|
|
@ -14,4 +14,8 @@ module BranchesHelper
|
||||||
|
|
||||||
::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(branch_name)
|
::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(branch_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def project_branches
|
||||||
|
options_for_select(@project.repository.branch_names, @project.default_branch)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
.form-group.branch
|
.form-group.branch
|
||||||
= label_tag 'target_branch', target_label, class: 'control-label'
|
= label_tag 'target_branch', target_label, class: 'control-label'
|
||||||
.col-sm-10
|
.col-sm-10
|
||||||
= select_tag "target_branch", grouped_options_refs, class: "select2 select2-sm js-target-branch"
|
= select_tag "target_branch", project_branches, class: "select2 select2-sm js-target-branch"
|
||||||
- if can?(current_user, :push_code, @project)
|
- if can?(current_user, :push_code, @project)
|
||||||
.js-create-merge-request-container
|
.js-create-merge-request-container
|
||||||
.checkbox
|
.checkbox
|
||||||
|
|
|
@ -16,6 +16,7 @@ describe 'Cherry-pick Commits' do
|
||||||
it do
|
it do
|
||||||
visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
|
visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
|
||||||
find("a[href='#modal-cherry-pick-commit']").click
|
find("a[href='#modal-cherry-pick-commit']").click
|
||||||
|
expect(page).not_to have_content('v1.0.0') # Only branches, not tags
|
||||||
page.within('#modal-cherry-pick-commit') do
|
page.within('#modal-cherry-pick-commit') do
|
||||||
uncheck 'create_merge_request'
|
uncheck 'create_merge_request'
|
||||||
click_button 'Cherry-pick'
|
click_button 'Cherry-pick'
|
||||||
|
|
Loading…
Reference in New Issue