diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-30 16:07:16 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-30 18:51:24 +0100 |
| commit | d984beba95608c073eb796e6176aa530b52a0d96 (patch) | |
| tree | 65f814b10272d20ae0c712c03dd78c9f30b12b0a | |
| parent | 264d25daac3615315050ab30ff6d6146eecb94a9 (diff) | |
| download | gitlab-ce-add-filter-sort-dropdown-to-dashboard-group-pages.tar.gz | |
Revert splitting group into "Activity" / "Projects" in the group nav baradd-filter-sort-dropdown-to-dashboard-group-pages
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 9 | ||||
| -rw-r--r-- | features/steps/shared/issuable.rb | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index a3bb7399b40..6f30be44a0c 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -7,16 +7,11 @@ %li.separate-item - = nav_link(path: 'groups#activity', html_options: {class: 'home'}) do + = nav_link(path: ['groups#activity', 'groups/projects#index'], html_options: {class: 'home'}) do = link_to activity_group_path(@group), title: 'Home' do = icon('dashboard fw') %span - Activity - = nav_link(path: 'groups/projects#index') do - = link_to group_projects_path(@group), title: 'Projects' do - = icon('cube fw') - %span - Projects + Group - if can?(current_user, :read_group, @group) - if current_user = nav_link(controller: [:group, :milestones]) do diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb index 25c2b476f43..c70bfc6bd5c 100644 --- a/features/steps/shared/issuable.rb +++ b/features/steps/shared/issuable.rb @@ -108,7 +108,7 @@ module SharedIssuable step 'I sort the list by "Oldest updated"' do find('button.dropdown-toggle.btn').click - page.within('ul.dropdown-menu.dropdown-menu-align-right li') do + page.within('ul.dropdown-menu.align-right li') do click_link "Oldest updated" end end |