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
Tatuya Kamada
gitlab-ce
Commits
2d5f4458
Commit
2d5f4458
authored
Mar 24, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix admin user projects lists.
parent
2953e0d1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+2
-0
app/views/users/_projects.html.haml
app/views/users/_projects.html.haml
+4
-4
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
CHANGELOG
View file @
2d5f4458
...
...
@@ -31,6 +31,7 @@ v 7.10.0 (unreleased)
- Replace commits calendar with faster contribution calendar that includes issues and merge requests
- Add inifinite scroll to user page activity
- Don't show commit comment button when user is not signed in.
- Fix admin user projects lists.
v 7.9.0
- Send EmailsOnPush email when branch or tag is created or deleted.
...
...
app/assets/javascripts/dispatcher.js.coffee
View file @
2d5f4458
...
...
@@ -98,6 +98,8 @@ class Dispatcher
when
'users:show'
new
User
()
new
Activities
()
when
'admin:users:show'
new
ProjectsList
()
switch
path
.
first
()
when
'admin'
...
...
app/views/users/_projects.html.haml
View file @
2d5f4458
-
if
@
contributed_projects
.
present?
-
if
local_assigns
.
has_key?
(
:contributed_projects
)
&&
contributed_projects
.
present?
.panel.panel-default.contributed-projects
.panel-heading
Projects contributed to
=
render
'shared/projects_list'
,
projects:
@
contributed_projects
.
sort_by
(
&
:star_count
).
reverse
,
projects:
contributed_projects
.
sort_by
(
&
:star_count
).
reverse
,
projects_limit:
5
,
stars:
true
,
avatar:
false
-
if
@
projects
.
present?
-
if
local_assigns
.
has_key?
(
:projects
)
&&
projects
.
present?
.panel.panel-default
.panel-heading
Personal projects
=
render
'shared/projects_list'
,
projects:
@
projects
.
sort_by
(
&
:star_count
).
reverse
,
projects:
projects
.
sort_by
(
&
:star_count
).
reverse
,
projects_limit:
10
,
stars:
true
,
avatar:
false
app/views/users/show.html.haml
View file @
2d5f4458
...
...
@@ -44,7 +44,7 @@
=
spinner
%aside
.col-md-4
=
render
'profile'
,
user:
@user
=
render
'projects'
=
render
'projects'
,
projects:
@projects
,
contributed_projects:
@contributed_projects
:coffeescript
$ ->
...
...
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