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
iv
gitlab-ce
Commits
c5d65ed6
Commit
c5d65ed6
authored
Mar 23, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'userpage-activity-scroll'
Conflicts: app/controllers/users_controller.rb
parents
81d603e2
fee1f2e0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
7 deletions
+23
-7
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+1
-0
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+19
-6
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-1
No files found.
CHANGELOG
View file @
c5d65ed6
...
@@ -29,6 +29,7 @@ v 7.10.0 (unreleased)
...
@@ -29,6 +29,7 @@ v 7.10.0 (unreleased)
- Improve oauth accounts UI in profile page
- Improve oauth accounts UI in profile page
- Add ability to unlink connected accounts
- Add ability to unlink connected accounts
- Replace commits calendar with faster contribution calendar that includes issues and merge requests
- Replace commits calendar with faster contribution calendar that includes issues and merge requests
- Add inifinite scroll to user page activity
v 7.9.0
v 7.9.0
- Add HipChat integration documentation (Stan Hu)
- Add HipChat integration documentation (Stan Hu)
...
...
app/assets/javascripts/dispatcher.js.coffee
View file @
c5d65ed6
...
@@ -97,6 +97,7 @@ class Dispatcher
...
@@ -97,6 +97,7 @@ class Dispatcher
new
ProjectFork
()
new
ProjectFork
()
when
'users:show'
when
'users:show'
new
User
()
new
User
()
new
Activities
()
switch
path
.
first
()
switch
path
.
first
()
when
'admin'
when
'admin'
...
...
app/controllers/users_controller.rb
View file @
c5d65ed6
...
@@ -13,17 +13,21 @@ class UsersController < ApplicationController
...
@@ -13,17 +13,21 @@ class UsersController < ApplicationController
# Collect only groups common for both users
# Collect only groups common for both users
@groups
=
@user
.
groups
&
GroupsFinder
.
new
.
execute
(
current_user
)
@groups
=
@user
.
groups
&
GroupsFinder
.
new
.
execute
(
current_user
)
# Get user activity feed for projects common for both users
@events
=
@user
.
recent_events
.
where
(
project_id:
authorized_projects_ids
).
with_associations
.
limit
(
30
)
@title
=
@user
.
name
@title
=
@user
.
name
@title_url
=
user_path
(
@user
)
@title_url
=
user_path
(
@user
)
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
atom
{
render
layout:
false
}
format
.
atom
do
load_events
render
layout:
false
end
format
.
json
do
load_events
pager_json
(
"events/_events"
,
@events
.
count
)
end
end
end
end
end
...
@@ -81,4 +85,13 @@ class UsersController < ApplicationController
...
@@ -81,4 +85,13 @@ class UsersController < ApplicationController
@contributions_calendar
||=
Gitlab
::
ContributionsCalendar
.
@contributions_calendar
||=
Gitlab
::
ContributionsCalendar
.
new
(
contributed_projects
.
reject
(
&
:forked?
),
@user
)
new
(
contributed_projects
.
reject
(
&
:forked?
),
@user
)
end
end
def
load_events
# Get user activity feed for projects common for both users
@events
=
@user
.
recent_events
.
where
(
project_id:
authorized_projects_ids
).
with_associations
@events
=
@events
.
limit
(
20
).
offset
(
params
[
:offset
]
||
0
)
end
end
end
app/views/users/show.html.haml
View file @
c5d65ed6
...
@@ -40,7 +40,8 @@
...
@@ -40,7 +40,8 @@
%strong
%strong
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
@events
.content_list
=
spinner
%aside
.col-md-4
%aside
.col-md-4
=
render
'profile'
,
user:
@user
=
render
'profile'
,
user:
@user
=
render
'projects'
=
render
'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