diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-30 12:18:59 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-30 12:18:59 +0300 |
| commit | c48518ac21d40df19a56027a561f6fa727423701 (patch) | |
| tree | 4c156d3c4226df7e58a2d09222afd807859da3ac | |
| parent | 0a1b50ef3f9215ca5ddfcd8632ae56ed1af18c67 (diff) | |
| parent | 36bde0fcb197aa7ca93bb615cda070f55f5e268f (diff) | |
Merge branch 'fix-admin-page-personal-projects' into 'master'
Fix Error 500 when viewing user's personal projects from admin page
This is a regression introduced in 4d7f00f.
Closes #3680
Closes https://github.com/gitlabhq/gitlabhq/issues/9861
Closes gitlab-org/gitlab-ee#90
See merge request !1909
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/users/_projects.html.haml | 13 | ||||
| -rw-r--r-- | app/views/admin/users/projects.html.haml | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 39a57231d9c..2f02b9dc265 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. 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 500 error when update group member permission - Fix: Raw private snippets access workflow diff --git a/app/views/admin/users/_projects.html.haml b/app/views/admin/users/_projects.html.haml new file mode 100644 index 00000000000..a126a858ea8 --- /dev/null +++ b/app/views/admin/users/_projects.html.haml @@ -0,0 +1,13 @@ +- 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 diff --git a/app/views/admin/users/projects.html.haml b/app/views/admin/users/projects.html.haml index 0d7a1a25a80..b655b2a15f5 100644 --- a/app/views/admin/users/projects.html.haml +++ b/app/views/admin/users/projects.html.haml @@ -14,7 +14,7 @@ .row .col-md-6 - if @personal_projects.present? - = render 'users/projects', projects: @personal_projects + = render 'admin/users/projects', projects: @personal_projects - else .nothing-here-block This user has no personal projects. |