diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-15 14:37:07 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-15 14:37:07 +0000 |
| commit | 15b63e15eda5f69d0f918d8df44bf614a14b3cda (patch) | |
| tree | d12112b05ae587a50688332402b9956ab776a4e8 | |
| parent | 62a600457a2192ff7487677c62eb61ba329cf2fb (diff) | |
| parent | 178062a1c541eba3f89da7fb14dace365a3ded71 (diff) | |
| download | gitlab-ce-15b63e15eda5f69d0f918d8df44bf614a14b3cda.tar.gz | |
Merge branch '40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived' into 'master'
Resolve "404 when listing archived projects in a group where all projects have been archived"
Closes #40623
See merge request gitlab-org/gitlab-ce!17077
| -rw-r--r-- | app/views/shared/groups/_dropdown.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived.yml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/shared/groups/_dropdown.html.haml b/app/views/shared/groups/_dropdown.html.haml index 1a259b679c7..8607be9cd06 100644 --- a/app/views/shared/groups/_dropdown.html.haml +++ b/app/views/shared/groups/_dropdown.html.haml @@ -23,11 +23,11 @@ - if show_archive_options %li.divider %li.js-filter-archived-projects - = link_to group_children_path(@group, archived: nil), class: ("is-active" unless params[:archived].present?) do + = link_to filter_groups_path(archived: nil), class: ("is-active" unless params[:archived].present?) do Hide archived projects %li.js-filter-archived-projects - = link_to group_children_path(@group, archived: true), class: ("is-active" if Gitlab::Utils.to_boolean(params[:archived])) do + = link_to filter_groups_path(archived: true), class: ("is-active" if Gitlab::Utils.to_boolean(params[:archived])) do Show archived projects %li.js-filter-archived-projects - = link_to group_children_path(@group, archived: 'only'), class: ("is-active" if params[:archived] == 'only') do + = link_to filter_groups_path(archived: 'only'), class: ("is-active" if params[:archived] == 'only') do Show archived projects only diff --git a/changelogs/unreleased/40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived.yml b/changelogs/unreleased/40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived.yml new file mode 100644 index 00000000000..543fd7c5e8d --- /dev/null +++ b/changelogs/unreleased/40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived.yml @@ -0,0 +1,4 @@ +title: Fix 404 when listing archived projects in a group where all projects have been archived +merge_request: 17077 +author: Ashley Dumaine +type: fixed |