diff --git a/app/controllers/public/projects_controller.rb b/app/controllers/public/projects_controller.rb index b929b23e68c..6c0b397b4c3 100644 --- a/app/controllers/public/projects_controller.rb +++ b/app/controllers/public/projects_controller.rb @@ -7,6 +7,7 @@ class Public::ProjectsController < ApplicationController def index @projects = Project.public_only + @projects = @projects.search(params[:search]) if params[:search].present? @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20) end end diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml index c31fcfd15de..e2b19d0d824 100644 --- a/app/views/public/projects/index.html.haml +++ b/app/views/public/projects/index.html.haml @@ -1,6 +1,16 @@ -%h3.page_title - Projects (#{@projects.total_count}) - %small with read-only access +.row + .span6 + %h3.page_title + Projects (#{@projects.total_count}) + %small with read-only access + .span6 + .pull-right + = form_tag public_projects_path, method: :get, class: 'form-inline' do |f| + .search-holder + .input + = search_field_tag :search, params[:search], placeholder: "gitlab-ci", class: "span3 search-text-input", id: "projects_search" + = submit_tag 'Search', class: "btn btn-primary wide" + %hr .public-projects