diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-13 12:46:29 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-13 12:46:29 +0000 |
| commit | dc38551b93abe5f1adb655aff68fc451dc3d8e73 (patch) | |
| tree | 0cfb8150fe76afe92d591127367afb9cff455bf0 /app/views | |
| parent | e8ebc1b6374464586269fcc8f5a025934eac8294 (diff) | |
| parent | b9977525394ac714e31c1751690c7b993eb8d830 (diff) | |
| download | gitlab-ce-dc38551b93abe5f1adb655aff68fc451dc3d8e73.tar.gz | |
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 'app/views')
| -rw-r--r-- | app/views/projects/commit/_change.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index 44ef1fdbbe3..d9b800a4ded 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -17,7 +17,7 @@ .form-group.branch = label_tag 'target_branch', target_label, class: 'control-label' .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) .js-create-merge-request-container .checkbox |