diff options
| author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-04-12 18:11:46 +0300 |
|---|---|---|
| committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-05-06 18:41:47 +0300 |
| commit | 5f22907418397861d9b07cbaeea05ef7264d5605 (patch) | |
| tree | ed1485b6f47a701e6271d15ae8160814287de3db /app/views/dashboard | |
| parent | aebf22f639073ab4d5c0ff4970d60bf24e8879f0 (diff) | |
Update project list specs
Add tests to ensure search only executes with a button click or enter,
sort by Name, Last updated, Created date and Stars and tests for
Visibility filter
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/projects/_nav.html.haml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/dashboard/projects/_nav.html.haml b/app/views/dashboard/projects/_nav.html.haml index 8f4a517d918..b01e6c4293c 100644 --- a/app/views/dashboard/projects/_nav.html.haml +++ b/app/views/dashboard/projects/_nav.html.haml @@ -3,7 +3,7 @@ - inactive_class = 'btn p-2' - active_class = 'btn p-2 active' - is_explore_trending = local_assigns.fetch(:is_explore_trending, false) -.nav-block +.nav-block{ class: Feature.enabled?(:project_list_filter_bar) ? "w-100" : "" } - if !Feature.enabled?(:project_list_filter_bar) %ul.nav-links.mobile-separator.nav.nav-tabs = nav_link(html_options: { class: ("active" unless params[:personal].present?) }) do @@ -11,8 +11,7 @@ = nav_link(html_options: { class: ("active" if params[:personal].present?) }) do = link_to s_('DashboardProjects|Personal'), filter_projects_path(personal: true) - else - -# %ul.btn-group.button-filter-group.d-flex.m-0.p-0 - %div.btn-group.button-filter-group.d-flex.m-0.p-0 + .btn-group.button-filter-group.d-flex.m-0.p-0 - if is_explore = link_to s_('DashboardProjects|Trending'), trending_explore_projects_path, class: is_explore_trending ? active_class : inactive_class = link_to s_('DashboardProjects|All'), explore_projects_path, class: is_explore_trending ? inactive_class : active_class |