diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-26 16:36:17 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-26 16:36:17 +0200 |
| commit | cb90368a692149b4e01b50d7c6682c48cffa438b (patch) | |
| tree | 6236d6f4fd56acad1015950d483db0ba8fa3ada9 /app/views/shared/projects | |
| parent | c6f19aed51736e5945283a611eae09f32a9b5aeb (diff) | |
| parent | f127edd012bd8b6f76ac67d69aadbd7d4837258f (diff) | |
| download | gitlab-ce-cb90368a692149b4e01b50d7c6682c48cffa438b.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
Diffstat (limited to 'app/views/shared/projects')
| -rw-r--r-- | app/views/shared/projects/_dropdown.html.haml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/views/shared/projects/_dropdown.html.haml b/app/views/shared/projects/_dropdown.html.haml index e7e04621ff4..1169bed0382 100644 --- a/app/views/shared/projects/_dropdown.html.haml +++ b/app/views/shared/projects/_dropdown.html.haml @@ -1,4 +1,5 @@ - @sort ||= sort_value_recently_updated +- personal = params[:personal] - archived = params[:archived] .dropdown.inline %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'} @@ -10,7 +11,7 @@ Sort by - projects_sort_options_hash.each do |value, title| %li - = link_to filter_projects_path(sort: value, archived: archived), class: ("is-active" if @sort == value) do + = link_to filter_projects_path(sort: value, archived: archived, personal: personal), class: ("is-active" if @sort == value) do = title %li.divider @@ -20,3 +21,11 @@ %li = link_to filter_projects_path(sort: @sort, archived: true), class: ("is-active" if params[:archived].present?) do Show archived projects + - if current_user + %li.divider + %li + = link_to filter_projects_path(sort: @sort, personal: nil), class: ("is-active" unless personal) do + Owned by anyone + %li + = link_to filter_projects_path(sort: @sort, personal: true), class: ("is-active" if personal) do + Owned by me |