diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-06 12:38:13 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-06 12:39:03 +0200 |
| commit | 9cc700315ac4d38b5a752ea4eb481e37cb547379 (patch) | |
| tree | 1ee6afbacecd1d3a5b6013761808aae15d1a11dc /app/views | |
| parent | 951431bcf9e301e05b3caec7004de6f61e818054 (diff) | |
| parent | a74c1243df63208095c39265c3f27fcbe86ae763 (diff) | |
| download | gitlab-ce-9cc700315ac4d38b5a752ea4eb481e37cb547379.tar.gz | |
Merge branch 'jeroenj/gitlab-ce-group-milestone-archived-projects'
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/milestones/new.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |