Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-13 17:05:30 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-13 17:05:30 +0300
commitf6de5937e302493db2b9bcef7812ed36e1e049e6 (patch)
tree5cd95c593013e5d386f623e8dc3af82e48fc73a7 /spec/features
parentc534d2e89ed00ff98c83a197674b5ac66a8aca93 (diff)
parent57ebd3996eb5d8ff85c5899c7a7f351272655562 (diff)
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/projects/commits/cherry_pick_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/features/projects/commits/cherry_pick_spec.rb b/spec/features/projects/commits/cherry_pick_spec.rb
index 0559b02f321..f88c0616b52 100644
--- a/spec/features/projects/commits/cherry_pick_spec.rb
+++ b/spec/features/projects/commits/cherry_pick_spec.rb
@@ -16,6 +16,7 @@ describe 'Cherry-pick Commits' do
it do
visit namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
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
uncheck 'create_merge_request'
click_button 'Cherry-pick'