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
Jérome Perrin
gitlab-ce
Commits
36bde0fc
Commit
36bde0fc
authored
Nov 25, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Error 500 when viewing user's personal projects from admin page
This is a regression introduced in
4d7f00fd
. Closes #3680
parent
dee28c50
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
CHANGELOG
CHANGELOG
+1
-0
app/views/admin/users/_projects.html.haml
app/views/admin/users/_projects.html.haml
+13
-0
app/views/admin/users/projects.html.haml
app/views/admin/users/projects.html.haml
+1
-1
No files found.
CHANGELOG
View file @
36bde0fc
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 8.3.0 (unreleased)
v 8.3.0 (unreleased)
- Fix Error 500 when viewing user's personal projects from admin page (Stan Hu)
- Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
- Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
- Fix 500 error when update group member permission
- Fix 500 error when update group member permission
...
...
app/views/admin/users/_projects.html.haml
0 → 100644
View file @
36bde0fc
-
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_limit:
5
,
stars:
true
,
avatar:
false
-
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_limit:
10
,
stars:
true
,
avatar:
false
app/views/admin/users/projects.html.haml
View file @
36bde0fc
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
.row
.row
.col-md-6
.col-md-6
-
if
@personal_projects
.
present?
-
if
@personal_projects
.
present?
=
render
'users/projects'
,
projects:
@personal_projects
=
render
'
admin/
users/projects'
,
projects:
@personal_projects
-
else
-
else
.nothing-here-block
This user has no personal projects.
.nothing-here-block
This user has no personal 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