diff options
author | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:26 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:26 +0100 |
commit | c9be4d65f2d3f6695e99cc7f99ad889b48780e3b (patch) | |
tree | fda0d78e73795cb8da353e52344b04787cca3802 /app/views/groups/_projects.html.haml | |
parent | 8006d025139a506f732137209c85935353bae276 (diff) | |
parent | 8b918267c7477f7e1a36b4f3cc12c9e244204cb9 (diff) | |
download | gitlab-ce-c9be4d65f2d3f6695e99cc7f99ad889b48780e3b.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to 'app/views/groups/_projects.html.haml')
-rw-r--r-- | app/views/groups/_projects.html.haml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index bbafc08435a..9c16ab7e30f 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -1,11 +1,11 @@ -.projects-list-holder - .projects-search-form - .input-group - = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false - - if can? current_user, :create_projects, @group - %span.input-group-btn - = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-green' do - %i.fa.fa-plus - New Project +.top-area + .nav-controls + = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| + = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'input-short project-filter-form-field form-control projects-list-filter', spellcheck: false, id: 'project-filter-form-field' + - if current_user && current_user.can_create_project? + = link_to new_project_path, class: 'btn btn-new' do + = icon('plus') + New Project +.projects-list-holder = render 'shared/projects/list', projects: @projects, projects_limit: 20, stars: false, skip_namespace: true |