Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c5d65ed6
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c5d65ed6
编写于
3月 23, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'userpage-activity-scroll'
Conflicts: app/controllers/users_controller.rb
上级
81d603e2
fee1f2e0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
7 deletion
+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
未找到文件。
CHANGELOG
浏览文件 @
c5d65ed6
...
...
@@ -29,6 +29,7 @@ v 7.10.0 (unreleased)
- Improve oauth accounts UI in profile page
- Add ability to unlink connected accounts
- Replace commits calendar with faster contribution calendar that includes issues and merge requests
- Add inifinite scroll to user page activity
v 7.9.0
- Add HipChat integration documentation (Stan Hu)
...
...
app/assets/javascripts/dispatcher.js.coffee
浏览文件 @
c5d65ed6
...
...
@@ -97,6 +97,7 @@ class Dispatcher
new
ProjectFork
()
when
'users:show'
new
User
()
new
Activities
()
switch
path
.
first
()
when
'admin'
...
...
app/controllers/users_controller.rb
浏览文件 @
c5d65ed6
...
...
@@ -13,17 +13,21 @@ class UsersController < ApplicationController
# Collect only groups common for both users
@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_url
=
user_path
(
@user
)
respond_to
do
|
format
|
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
...
...
@@ -81,4 +85,13 @@ class UsersController < ApplicationController
@contributions_calendar
||=
Gitlab
::
ContributionsCalendar
.
new
(
contributed_projects
.
reject
(
&
:forked?
),
@user
)
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
app/views/users/show.html.haml
浏览文件 @
c5d65ed6
...
...
@@ -40,7 +40,8 @@
%strong
%i
.fa.fa-rss
=
render
@events
.content_list
=
spinner
%aside
.col-md-4
=
render
'profile'
,
user:
@user
=
render
'projects'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录