diff options
| author | Jeroen Jacobs <git@jeroenj.be> | 2016-06-27 14:35:30 +0200 |
|---|---|---|
| committer | Jeroen Jacobs <git@jeroenj.be> | 2016-10-05 16:13:29 +0200 |
| commit | a74c1243df63208095c39265c3f27fcbe86ae763 (patch) | |
| tree | 3ecb6f4ae799eae78e4375cb566fcf0c13bfbb53 | |
| parent | 219413c5d1dbc05c4832ca372d4b06c06f2e0542 (diff) | |
| download | gitlab-ce-a74c1243df63208095c39265c3f27fcbe86ae763.tar.gz | |
Don't include archived projects when creating group milestones
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/groups/milestones/new.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index c3ed6011216..2d92d03de12 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -54,6 +54,7 @@ v 8.13.0 (unreleased) - Close todos when accepting merge requests via the API !6486 (tonygambone) - Changed Slack service user referencing from full name to username (Sebastian Poxhofer) - Add Container Registry on/off status to Admin Area !6638 (the-undefined) + - Don't include archived projects when creating group milestones (!4940) v 8.12.4 (unreleased) - Fix type mismatch bug when closing Jira issue diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml index ca6c4326d1c..23d438b2aa1 100644 --- a/app/views/groups/milestones/new.html.haml +++ b/app/views/groups/milestones/new.html.haml @@ -33,8 +33,8 @@ .form-group = f.label :projects, "Projects", class: "control-label" .col-sm-10 - = f.collection_select :project_ids, @group.projects, :id, :name, - { selected: @group.projects.map(&:id) }, multiple: true, class: 'select2' + = f.collection_select :project_ids, @group.projects.non_archived, :id, :name, + { selected: @group.projects.non_archived.pluck(:id) }, multiple: true, class: 'select2' .col-md-6 .form-group |