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
0e9f4320
Commit
0e9f4320
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-user-profile' into 'master'
Improve user profile page See merge request !1539
parents
a04ac761
367d9a2d
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
14 deletions
+29
-14
CHANGELOG
CHANGELOG
+1
-0
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+3
-0
app/views/explore/projects/_project.html.haml
app/views/explore/projects/_project.html.haml
+3
-5
app/views/users/_projects.html.haml
app/views/users/_projects.html.haml
+21
-6
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-3
No files found.
CHANGELOG
View file @
0e9f4320
...
...
@@ -59,6 +59,7 @@ v 7.8.0 (unreleased)
- Fix duplicate authorized applications in user profile and incorrect application client count in admin area.
- Make sure Markdown previews always use the same styling as the eventual destination.
- Remove deprecated Group#owner_id from API
- Show projects user contributed to on user page. Show stars near project on user page.
v 7.7.2
- Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
...
...
This diff is collapsed.
Click to expand it.
app/controllers/users_controller.rb
View file @
0e9f4320
...
...
@@ -8,6 +8,9 @@ class UsersController < ApplicationController
visible_projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
authorized_projects_ids
=
visible_projects
.
pluck
(
:id
)
@contributed_projects
=
Project
.
where
(
id:
authorized_projects_ids
).
in_group_namespace
@projects
=
@user
.
personal_projects
.
where
(
id:
authorized_projects_ids
)
...
...
This diff is collapsed.
Click to expand it.
app/views/explore/projects/_project.html.haml
View file @
0e9f4320
...
...
@@ -3,11 +3,9 @@
.project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project
.
name_with_namespace
,
project
-
if
current_page?
(
starred_explore_projects_path
)
%strong
.pull-right
%span
.pull-right
%i
.fa.fa-star
=
pluralize
project
.
star_count
,
'star'
=
project
.
star_count
.project-info
-
if
project
.
description
.
present?
...
...
This diff is collapsed.
Click to expand it.
app/views/users/_projects.html.haml
View file @
0e9f4320
.panel.panel-default
-
if
@contributed_projects
.
present?
.panel.panel-default
.panel-heading
Projects contributed to
%ul
.well-list
-
@contributed_projects
.
sort_by
(
&
:star_count
).
reverse
.
each
do
|
project
|
%li
=
link_to_project
project
%span
.pull-right.light
%i
.fa.fa-star
=
project
.
star_count
-
if
@projects
.
present?
.panel.panel-default
.panel-heading
Personal projects
%ul
.well-list
-
projects
.
each
do
|
project
|
-
@projects
.
sort_by
(
&
:star_count
).
reverse
.
each
do
|
project
|
%li
=
link_to_project
project
%span
.pull-right.light
%i
.fa.fa-star
=
project
.
star_count
This diff is collapsed.
Click to expand it.
app/views/users/show.html.haml
View file @
0e9f4320
...
...
@@ -35,9 +35,7 @@
=
render
@events
.col-md-4
=
render
'profile'
,
user:
@user
-
if
@projects
.
present?
=
render
'projects'
,
projects:
@projects
=
render
'projects'
:coffeescript
$ ->
...
...
This diff is collapsed.
Click to expand it.
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