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
Boxiang Sun
gitlab-ce
Commits
a3f0a176
Commit
a3f0a176
authored
Mar 02, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show "Welcome to GitLab" when the search didn't return any projects
parent
c71c5876
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
CHANGELOG
CHANGELOG
+1
-0
app/controllers/dashboard/projects_controller.rb
app/controllers/dashboard/projects_controller.rb
+2
-2
app/views/dashboard/projects/index.html.haml
app/views/dashboard/projects/index.html.haml
+1
-1
No files found.
CHANGELOG
View file @
a3f0a176
...
@@ -16,6 +16,7 @@ v 8.5.2
...
@@ -16,6 +16,7 @@ v 8.5.2
- Fix broken icons on installations with relative URL (Artem Sidorenko)
- Fix broken icons on installations with relative URL (Artem Sidorenko)
- Fix import from gitlab.com (KazSawada)
- Fix import from gitlab.com (KazSawada)
- Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
- Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
- Don't show "Welcome to GitLab" when the search didn't return any projects
v 8.5.1
v 8.5.1
- Fix group projects styles
- Fix group projects styles
...
...
app/controllers/dashboard/projects_controller.rb
View file @
a3f0a176
...
@@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
...
@@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
includes
(
:namespace
)
@projects
=
@projects
.
includes
(
:namespace
)
terms
=
params
[
'filter_projects'
]
terms
=
params
[
:filter_projects
]
if
terms
.
present?
if
terms
.
present?
@projects
=
@projects
.
search
(
terms
)
@projects
=
@projects
.
search
(
terms
)
...
@@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
...
@@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects
=
@projects
.
includes
(
:namespace
,
:forked_from_project
,
:tags
)
@projects
=
@projects
.
includes
(
:namespace
,
:forked_from_project
,
:tags
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
terms
=
params
[
'filter_projects'
]
terms
=
params
[
:filter_projects
]
if
terms
.
present?
if
terms
.
present?
@projects
=
@projects
.
search
(
terms
)
@projects
=
@projects
.
search
(
terms
)
...
...
app/views/dashboard/projects/index.html.haml
View file @
a3f0a176
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
-
if
@last_push
-
if
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
-
if
@projects
.
any?
-
if
@projects
.
any?
||
params
[
:filter_projects
]
=
render
'projects'
=
render
'projects'
-
else
-
else
=
render
"zero_authorized_projects"
=
render
"zero_authorized_projects"
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