diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-13 15:46:29 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-13 15:46:29 +0300 |
| commit | dc38551b93abe5f1adb655aff68fc451dc3d8e73 (patch) | |
| tree | 0cfb8150fe76afe92d591127367afb9cff455bf0 /spec/features | |
| parent | e8ebc1b6374464586269fcc8f5a025934eac8294 (diff) | |
| parent | b9977525394ac714e31c1751690c7b993eb8d830 (diff) | |
Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master'
Only show branches for revert / cherry-pick
## What does this MR do?
Stop showing tags in the revert and cherry-pick select options. You can't change a tag anyway.
## Are there points in the code the reviewer needs to double check?
Uncertain.
## Why was this MR needed?
Showing tags doesn't make any sense and will just throw an exception if the user tries to cherry-pick or revert onto a tag.
## What are the relevant issue numbers?
Fixes #18377.
## Screenshots (if relevant)
On the GitLab CE repo:
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4596
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/commits/cherry_pick_spec.rb | 1 |
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' |