Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f4f36f78
Commit
f4f36f78
authored
Mar 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove separate search page from group
parent
cc1dd624
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
20 deletions
+0
-20
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+0
-9
app/views/groups/search.html.haml
app/views/groups/search.html.haml
+0
-9
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+0
-2
No files found.
app/controllers/groups_controller.rb
View file @
f4f36f78
...
...
@@ -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
...
...
app/views/groups/search.html.haml
deleted
100644 → 0
View file @
cc1dd624
=
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'
app/views/layouts/group.html.haml
View file @
f4f36f78
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment