diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-14 12:37:28 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-14 12:37:28 +0200 |
| commit | f4f36f78ddb3d720ad7ae89ecea300c9f48775c7 (patch) | |
| tree | bfd6e900aaf154971da34b6918bfe5f304ba375e | |
| parent | cc1dd624aab2f5f85ec121506884965f5353411d (diff) | |
| download | gitlab-ce-f4f36f78ddb3d720ad7ae89ecea300c9f48775c7.tar.gz | |
Remove separate search page from group
| -rw-r--r-- | app/controllers/groups_controller.rb | 9 | ||||
| -rw-r--r-- | app/views/groups/search.html.haml | 9 | ||||
| -rw-r--r-- | app/views/layouts/group.html.haml | 2 |
3 files changed, 0 insertions, 20 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index cbb024bb78f..bdf3567fef2 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -59,15 +59,6 @@ class GroupsController < ApplicationController end end - def search - result = SearchContext.new(project_ids, params).execute - - @projects = result[:projects] - @merge_requests = result[:merge_requests] - @issues = result[:issues] - @wiki_pages = result[:wiki_pages] - end - def people @project = group.projects.find(params[:project_id]) if params[:project_id] @users = @project ? @project.users : group.users diff --git a/app/views/groups/search.html.haml b/app/views/groups/search.html.haml deleted file mode 100644 index f56bbadeac0..00000000000 --- a/app/views/groups/search.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -= form_tag search_group_path(@group), method: :get, class: 'form-inline' do |f| - .padded - = label_tag :search do - %strong Looking for - .input - = search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-xxlarge search-text-input", id: "dashboard_search" - = submit_tag 'Search', class: "btn btn-primary wide" -- if params[:search].present? - = render 'search/result' diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 624d5ab5288..45528281ed0 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -17,8 +17,6 @@ = link_to merge_requests_group_path(@group) do Merge Requests %span.count= current_user.cared_merge_requests.opened.of_group(@group).count - = nav_link(path: 'groups#search') do - = link_to "Search", search_group_path(@group) = nav_link(path: 'groups#people') do = link_to "People", people_group_path(@group) |