Commit 490ae737 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij
Browse files

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

module SortingHelper
def sort_title_oldest_updated
'Oldest updated'
end
def sort_title_recently_updated
'Recently updated'
end
def sort_title_oldest_created
'Oldest created'
end
def sort_title_recently_created
'Recently created'
end
end
......@@ -56,13 +56,13 @@
= link_to admin_projects_path(sort: nil) do
Name
= link_to admin_projects_path(sort: 'newest') do
Newest
= sort_title_recently_created
= link_to admin_projects_path(sort: 'oldest') do
Oldest
= sort_title_oldest_created
= link_to admin_projects_path(sort: 'recently_updated') do
Recently updated
= sort_title_recently_updated
= link_to admin_projects_path(sort: 'last_updated') do
Last updated
= sort_title_oldest_updated
= link_to admin_projects_path(sort: 'largest_repository') do
Largest repository
= link_to 'New Project', new_project_path, class: "btn btn-new"
......
......@@ -49,9 +49,10 @@
= link_to admin_users_path(sort: 'oldest_sign_in') do
Oldest sign in
= link_to admin_users_path(sort: 'recently_created') do
Recently created
= sort_title_recently_created
= link_to admin_users_path(sort: 'late_created') do
Late created
= sort_title_oldest_created
= link_to 'New User', new_admin_user_path, class: "btn btn-new"
%ul.well-list
- @users.each do |user|
......
......@@ -14,13 +14,14 @@
= link_to projects_dashboard_filter_path(sort: nil) do
Name
= link_to projects_dashboard_filter_path(sort: 'newest') do
Newest
= sort_title_recently_created
= link_to projects_dashboard_filter_path(sort: 'oldest') do
Oldest
= sort_title_oldest_created
= link_to projects_dashboard_filter_path(sort: 'recently_updated') do
Recently updated
= sort_title_recently_updated
= link_to projects_dashboard_filter_path(sort: 'last_updated') do
Last updated
= sort_title_oldest_updated
%p.light
All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr
......
......@@ -20,13 +20,13 @@
= link_to explore_groups_path(sort: nil) do
Name
= link_to explore_groups_path(sort: 'newest') do
Newest
= sort_title_recently_created
= link_to explore_groups_path(sort: 'oldest') do
Oldest
= sort_title_oldest_created
= link_to explore_groups_path(sort: 'recently_updated') do
Recently updated
= sort_title_recently_updated
= link_to explore_groups_path(sort: 'last_updated') do
Last updated
= sort_title_oldest_updated
%hr
......
......@@ -20,13 +20,13 @@
= link_to explore_projects_path(sort: nil) do
Name
= link_to explore_projects_path(sort: 'newest') do
Newest
= sort_title_recently_created
= link_to explore_projects_path(sort: 'oldest') do
Oldest
= sort_title_oldest_created
= link_to explore_projects_path(sort: 'recently_updated') do
Recently updated
= sort_title_recently_updated
= link_to explore_projects_path(sort: 'last_updated') do
Last updated
= sort_title_oldest_updated
%hr
.public-projects
......
......@@ -20,9 +20,9 @@
= link_to project_branches_path(sort: nil) do
Name
= link_to project_branches_path(sort: 'recently_updated') do
Recently updated
= sort_title_recently_updated
= link_to project_branches_path(sort: 'last_updated') do
Last updated
= sort_title_oldest_updated
%hr
- unless @branches.empty?
%ul.bordered-list.top-list.all-branches
......
......@@ -9,13 +9,13 @@
%ul.dropdown-menu
%li
= link_to project_filter_path(sort: 'newest') do
Newest
= sort_title_recently_created
= link_to project_filter_path(sort: 'oldest') do
Oldest
= sort_title_oldest_created
= link_to project_filter_path(sort: 'recently_updated') do
Recently updated
= sort_title_recently_updated
= link_to project_filter_path(sort: 'last_updated') do
Last updated
= sort_title_oldest_updated
= link_to project_filter_path(sort: 'milestone_due_soon') do
Milestone due soon
= link_to project_filter_path(sort: 'milestone_due_later') do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment