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 | |
| 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>
| -rw-r--r-- | CHANGELOG | 18 | ||||
| -rw-r--r-- | app/views/groups/milestones/new.html.haml | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/CHANGELOG b/CHANGELOG index 649215db31c..e3b85b20ed0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ v 8.13.0 (unreleased) - Replaced the check sign to arrow in the show build view. !6501 - Add a /wip slash command to toggle the Work In Progress status of a merge request. !6259 (tbalthazar) - Speed-up group milestones show page + - Don't include archived projects when creating group milestones. !4940 (Jeroen Jacobs) - Keep refs for each deployment - Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller) - Add more tests for calendar contribution (ClemMakesApps) @@ -58,23 +59,6 @@ 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) - - Grouped pipeline dropdown is a scrollable container - -v 8.12.5 (unreleased) - -v 8.12.4 - - Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. !6294 (lukehowell) - - Fix padding in build sidebar. !6506 - - Changed compare dropdowns to dropdowns with isolated search input. !6550 - - Fix race condition on LFS Token. !6592 - - Fix type mismatch bug when closing Jira issue. !6619 - - Fix lint-doc error. !6623 - - Skip wiki creation when GitHub project has wiki enabled. !6665 - - Fix issues importing services via Import/Export. !6667 - - Restrict failed login attempts for users with 2FA enabled. !6668 - - Fix failed project deletion when feature visibility set to private. !6688 - - Prevent claiming associated model IDs via import. - - Set GitLab project exported file permissions to owner only v 8.12.3 - Update Gitlab Shell to support low IO priority for storage moves 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 |