diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-09 13:50:14 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-09 13:50:14 +0000 |
| commit | d976941a8241dd0f5cdcd0e5cdb49f597fb4c349 (patch) | |
| tree | 502483a33d50f8ee2915cbf9da3ba9df98bd70b4 | |
| parent | 5d865bccecfb21854afd5c9b71ba67f007e11f09 (diff) | |
| parent | 2409acfa7f97fef81dd66640c64e9d0008b85cde (diff) | |
| download | gitlab-ce-d976941a8241dd0f5cdcd0e5cdb49f597fb4c349.tar.gz | |
Merge branch 'group-sort-dropdown-blank' into 'master'
Fixed default group sort option
Closes #38808
See merge request gitlab-org/gitlab-ce!14728
| -rw-r--r-- | app/controllers/dashboard/groups_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/group-sort-dropdown-blank.yml | 5 | ||||
| -rw-r--r-- | spec/features/dashboard/group_spec.rb | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb index 8057a0b455c..7ed18fb481c 100644 --- a/app/controllers/dashboard/groups_controller.rb +++ b/app/controllers/dashboard/groups_controller.rb @@ -1,6 +1,6 @@ class Dashboard::GroupsController < Dashboard::ApplicationController def index - @sort = params[:sort] || 'id_desc' + @sort = params[:sort] || 'created_desc' @groups = if params[:parent_id] && Group.supports_nested_groups? diff --git a/changelogs/unreleased/group-sort-dropdown-blank.yml b/changelogs/unreleased/group-sort-dropdown-blank.yml new file mode 100644 index 00000000000..dd16892be4d --- /dev/null +++ b/changelogs/unreleased/group-sort-dropdown-blank.yml @@ -0,0 +1,5 @@ +--- +title: Fixed group sort dropdown defaulting to empty +merge_request: +author: +type: fixed diff --git a/spec/features/dashboard/group_spec.rb b/spec/features/dashboard/group_spec.rb index 970173c7aaf..1213f8c32eb 100644 --- a/spec/features/dashboard/group_spec.rb +++ b/spec/features/dashboard/group_spec.rb @@ -5,6 +5,12 @@ RSpec.describe 'Dashboard Group' do sign_in(create(:user)) end + it 'defaults sort dropdown to last created' do + visit dashboard_groups_path + + expect(page).to have_button('Last created') + end + it 'creates new group', :js do visit dashboard_groups_path find('.btn-new').trigger('click') |