Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bfc359ca
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,发现更多精彩内容 >>
提交
bfc359ca
编写于
2月 19, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix project filter for MR on dashboard
上级
ba937b2b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
9 deletion
+22
-9
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+1
-1
app/models/issue.rb
app/models/issue.rb
+8
-2
app/models/merge_request.rb
app/models/merge_request.rb
+12
-5
app/models/user.rb
app/models/user.rb
+1
-1
未找到文件。
app/helpers/dashboard_helper.rb
浏览文件 @
bfc359ca
...
...
@@ -27,6 +27,6 @@ module DashboardHelper
items
.
opened
end
items
.
where
(
assignee_id:
current_user
.
id
).
count
items
.
cared
(
current_user
).
count
end
end
app/models/issue.rb
浏览文件 @
bfc359ca
...
...
@@ -24,7 +24,13 @@ class Issue < ActiveRecord::Base
acts_as_taggable_on
:labels
def
self
.
open_for
(
user
)
opened
.
assigned
(
user
)
class
<<
self
def
cared
(
user
)
where
(
'assignee_id = :user'
,
user:
user
.
id
)
end
def
open_for
(
user
)
opened
.
assigned
(
user
)
end
end
end
app/models/merge_request.rb
浏览文件 @
bfc359ca
...
...
@@ -43,12 +43,19 @@ class MergeRequest < ActiveRecord::Base
validates
:target_branch
,
presence:
true
validate
:validate_branches
def
self
.
find_all_by_branch
(
branch_name
)
where
(
"source_branch LIKE :branch OR target_branch LIKE :branch"
,
branch:
branch_name
)
end
def
self
.
find_all_by_milestone
(
milestone
)
where
(
"milestone_id = :milestone_id"
,
milestone_id:
milestone
)
class
<<
self
def
cared
(
user
)
where
(
'assignee_id = :user OR author_id = :user'
,
user:
user
.
id
)
end
def
find_all_by_branch
(
branch_name
)
where
(
"source_branch LIKE :branch OR target_branch LIKE :branch"
,
branch:
branch_name
)
end
def
find_all_by_milestone
(
milestone
)
where
(
"milestone_id = :milestone_id"
,
milestone_id:
milestone
)
end
end
def
human_state
...
...
app/models/user.rb
浏览文件 @
bfc359ca
...
...
@@ -267,7 +267,7 @@ class User < ActiveRecord::Base
end
def
cared_merge_requests
MergeRequest
.
where
(
"author_id = :id or assignee_id = :id"
,
id:
self
.
id
)
MergeRequest
.
cared
(
self
)
end
# Remove user from all projects and
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录