Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2d887d91
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,发现更多精彩内容 >>
提交
2d887d91
编写于
10月 29, 2012
作者:
R
randx
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'piffio-public_submission_milestones_for_mr'
上级
50a6c614
f417a265
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
194 addition
and
47 deletion
+194
-47
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+11
-0
app/assets/javascripts/milestones.js.coffee
app/assets/javascripts/milestones.js.coffee
+7
-0
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+13
-0
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+17
-0
app/contexts/merge_requests_load_context.rb
app/contexts/merge_requests_load_context.rb
+17
-2
app/controllers/milestones_controller.rb
app/controllers/milestones_controller.rb
+2
-1
app/decorators/user_decorator.rb
app/decorators/user_decorator.rb
+11
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+4
-0
app/models/merge_request.rb
app/models/merge_request.rb
+9
-1
app/models/milestone.rb
app/models/milestone.rb
+14
-1
app/views/merge_requests/_form.html.haml
app/views/merge_requests/_form.html.haml
+12
-6
app/views/merge_requests/_merge_request.html.haml
app/views/merge_requests/_merge_request.html.haml
+4
-0
app/views/merge_requests/index.html.haml
app/views/merge_requests/index.html.haml
+24
-13
app/views/merge_requests/show/_mr_box.html.haml
app/views/merge_requests/show/_mr_box.html.haml
+5
-1
app/views/milestones/_milestone.html.haml
app/views/milestones/_milestone.html.haml
+13
-10
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+24
-11
db/migrate/20121026114600_add_milestone_id_to_merge_requests.rb
...rate/20121026114600_add_milestone_id_to_merge_requests.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-1
未找到文件。
app/assets/javascripts/merge_requests.js
浏览文件 @
2d887d91
...
...
@@ -115,4 +115,15 @@ var MergeRequest = {
$
(
"
.merge_in_progress
"
).
hide
();
$
(
"
.automerge_widget.already_cannot_be_merged
"
).
show
();
}
};
/*
* Filter merge requests
*/
function
merge_requestsPage
()
{
$
(
"
#assignee_id
"
).
chosen
();
$
(
"
#milestone_id
"
).
chosen
();
$
(
"
#milestone_id, #assignee_id
"
).
on
(
"
change
"
,
function
(){
$
(
this
).
closest
(
"
form
"
).
submit
();
});
}
app/assets/javascripts/milestones.js.coffee
浏览文件 @
2d887d91
...
...
@@ -5,3 +5,10 @@ $ ->
$
(
'.milestone-issue-filter li'
).
toggleClass
(
'active'
)
$
(
'.milestone-issue-filter tr[data-closed]'
).
toggleClass
(
'hide'
)
false
$
(
'.milestone-merge-requests-filter tr[data-closed]'
).
addClass
(
'hide'
)
$
(
'.milestone-merge-requests-filter ul.nav li a'
).
click
->
$
(
'.milestone-merge-requests-filter li'
).
toggleClass
(
'active'
)
$
(
'.milestone-merge-requests-filter tr[data-closed]'
).
toggleClass
(
'hide'
)
false
app/assets/stylesheets/common.scss
浏览文件 @
2d887d91
...
...
@@ -670,3 +670,16 @@ pre {
padding
:
0
;
}
}
.milestone
.progress
{
margin-bottom
:
0
;
margin-top
:
4px
;
}
.float-link
{
float
:left
;
margin-right
:
15px
;
.s16
{
margin-right
:
5px
;
}
}
app/assets/stylesheets/sections/merge_requests.scss
浏览文件 @
2d887d91
...
...
@@ -121,3 +121,20 @@ li.merge_request {
.mr_direction_tip
{
margin-top
:
40px
}
.merge_requests_form_box
{
@extend
.main_box
;
.merge_requests_middle_box
{
@extend
.middle_box_content
;
height
:
30px
;
.merge_requests_assignee
{
@extend
.span6
;
float
:left
;
}
.merge_requests_milestone
{
@extend
.span4
;
float
:left
;
}
}
}
app/contexts/merge_requests_load_context.rb
浏览文件 @
2d887d91
# Build collection of Merge Requests
# based on filtering passed via params for @project
class
MergeRequestsLoadContext
<
BaseContext
def
execute
type
=
params
[
:f
]
...
...
@@ -9,8 +11,21 @@ class MergeRequestsLoadContext < BaseContext
when
'closed'
then
merge_requests
.
closed
when
'assigned-to-me'
then
merge_requests
.
opened
.
assigned
(
current_user
)
else
merge_requests
.
opened
end
.
page
(
params
[
:page
]).
per
(
20
)
end
merge_requests
.
includes
(
:author
,
:project
).
order
(
"closed, created_at desc"
)
merge_requests
=
merge_requests
.
page
(
params
[
:page
]).
per
(
20
)
merge_requests
=
merge_requests
.
includes
(
:author
,
:project
).
order
(
"closed, created_at desc"
)
# Filter by specific assignee_id (or lack thereof)?
if
params
[
:assignee_id
].
present?
merge_requests
=
merge_requests
.
where
(
assignee_id:
(
params
[
:assignee_id
]
==
'0'
?
nil
:
params
[
:assignee_id
]))
end
# Filter by specific milestone_id (or lack thereof)?
if
params
[
:milestone_id
].
present?
merge_requests
=
merge_requests
.
where
(
milestone_id:
(
params
[
:milestone_id
]
==
'0'
?
nil
:
params
[
:milestone_id
]))
end
merge_requests
end
end
app/controllers/milestones_controller.rb
浏览文件 @
2d887d91
...
...
@@ -31,7 +31,8 @@ class MilestonesController < ProjectResourceController
def
show
@issues
=
@milestone
.
issues
@users
=
@milestone
.
participants
@users
=
UserDecorator
.
decorate
(
@milestone
.
participants
)
@merge_requests
=
@milestone
.
merge_requests
respond_to
do
|
format
|
format
.
html
...
...
app/decorators/user_decorator.rb
0 → 100644
浏览文件 @
2d887d91
class
UserDecorator
<
ApplicationDecorator
decorates
:user
def
avatar_image
size
=
16
h
.
image_tag
h
.
gravatar_icon
(
self
.
email
,
size
),
class:
"avatar
#{
"s
#{
size
}
"
}
"
,
width:
size
end
def
tm_of
(
project
)
project
.
team_member_by_id
(
self
.
id
)
end
end
app/helpers/projects_helper.rb
浏览文件 @
2d887d91
...
...
@@ -10,5 +10,9 @@ module ProjectsHelper
def
link_to_project
project
link_to
project
.
name
,
project
end
def
tm_path
team_member
project_team_member_path
(
@project
,
team_member
)
end
end
app/models/merge_request.rb
浏览文件 @
2d887d91
require
Rails
.
root
.
join
(
"app/models/commit"
)
require
Rails
.
root
.
join
(
"app/roles/static_model"
)
class
MergeRequest
<
ActiveRecord
::
Base
include
IssueCommonality
include
Votes
attr_accessible
:title
,
:assignee_id
,
:closed
,
:target_branch
,
:source_branch
,
attr_accessible
:title
,
:assignee_id
,
:closed
,
:target_branch
,
:source_branch
,
:milestone_id
,
:author_id_of_changes
attr_accessor
:should_remove_source_branch
belongs_to
:milestone
BROKEN_DIFF
=
"--broken-diff"
UNCHECKED
=
1
...
...
@@ -26,6 +29,10 @@ class MergeRequest < ActiveRecord::Base
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
)
end
def
human_state
states
=
{
CAN_BE_MERGED
=>
"can_be_merged"
,
...
...
@@ -212,5 +219,6 @@ end
# st_diffs :text(4294967295
# merged :boolean default(FALSE), not null
# state :integer default(1), not null
# milestone_id :integer
#
app/models/milestone.rb
浏览文件 @
2d887d91
...
...
@@ -3,6 +3,7 @@ class Milestone < ActiveRecord::Base
belongs_to
:project
has_many
:issues
has_many
:merge_requests
validates
:title
,
presence:
true
validates
:project
,
presence:
true
...
...
@@ -15,8 +16,20 @@ class Milestone < ActiveRecord::Base
User
.
where
(
id:
issues
.
pluck
(
:assignee_id
))
end
def
open_items_count
self
.
issues
.
opened
.
count
+
self
.
merge_requests
.
opened
.
count
end
def
closed_items_count
self
.
issues
.
closed
.
count
+
self
.
merge_requests
.
closed
.
count
end
def
total_items_count
self
.
issues
.
count
+
self
.
merge_requests
.
count
end
def
percent_complete
((
self
.
issues
.
closed
.
count
*
100
)
/
self
.
issues
.
count
).
abs
((
closed_items_count
*
100
)
/
total_items_
count
).
abs
rescue
ZeroDivisionError
100
end
...
...
app/views/merge_requests/_form.html.haml
浏览文件 @
2d887d91
...
...
@@ -28,16 +28,22 @@
%h4
.cdark
2. Fill info
.clearfix
.m
ain
_box
.m
erge_requests_form
_box
.top_box_content
=
f
.
label
:title
do
%strong
=
"Title *"
.input
=
f
.
text_field
:title
,
class:
"input-xxlarge pad js-gfm-input"
,
maxlength:
255
,
rows:
5
.middle_box_content
=
f
.
label
:assignee_id
do
%i
.icon-user
Assign to
.input
=
f
.
select
(
:assignee_id
,
@project
.
users
.
all
.
collect
{
|
p
|
[
p
.
name
,
p
.
id
]
},
{
include_blank:
"Select user"
},
{
class:
'chosen span3'
})
.merge_requests_middle_box
.merge_requests_assignee
=
f
.
label
:assignee_id
do
%i
.icon-user
Assign to
.input
=
f
.
select
(
:assignee_id
,
@project
.
users
.
all
.
collect
{
|
p
|
[
p
.
name
,
p
.
id
]
},
{
include_blank:
"Select user"
},
{
class:
'chosen span3'
})
.merge_requests_milestone
=
f
.
label
:milestone_id
do
%i
.icon-time
Milestone
.input
=
f
.
select
(
:milestone_id
,
@project
.
milestones
.
active
.
all
.
collect
{
|
p
|
[
p
.
title
,
p
.
id
]
},
{
include_blank:
"Select milestone"
},
{
class:
'chosen'
})
.control-group
...
...
app/views/merge_requests/_merge_request.html.haml
浏览文件 @
2d887d91
...
...
@@ -10,6 +10,10 @@
%span
.btn.small.disabled.grouped
%i
.icon-comment
=
merge_request
.
mr_and_commit_notes
.
count
-
if
merge_request
.
milestone_id?
%span
.btn.small.disabled.grouped
%i
.icon-time
=
merge_request
.
project
.
milestones
.
find
(
merge_request
.
milestone_id
).
title
%span
.btn.small.disabled.grouped
=
merge_request
.
source_branch
→
...
...
app/views/merge_requests/index.html.haml
浏览文件 @
2d887d91
...
...
@@ -9,19 +9,26 @@
.ui-box
.title
%ul
.nav.nav-pills
%li
{
class:
(
"active"
if
(
params
[
:f
]
==
'open'
||
!
params
[
:f
]))}
=
link_to
project_merge_requests_path
(
@project
,
f:
'open'
)
do
Open
%li
{
class:
(
"active"
if
params
[
:f
]
==
"closed"
)}
=
link_to
project_merge_requests_path
(
@project
,
f:
"closed"
)
do
Closed
%li
{
class:
(
"active"
if
params
[
:f
]
==
'assigned-to-me'
)}
=
link_to
project_merge_requests_path
(
@project
,
f:
'assigned-to-me'
)
do
To Me
%li
{
class:
(
"active"
if
params
[
:f
]
==
'all'
)}
=
link_to
project_merge_requests_path
(
@project
,
f:
'all'
)
do
All
.left
%ul
.nav.nav-pills
%li
{
class:
(
"active"
if
(
params
[
:f
]
==
'open'
||
!
params
[
:f
]))}
=
link_to
project_merge_requests_path
(
@project
,
f:
'open'
,
milestone_id:
params
[
:milestone_id
])
do
Open
%li
{
class:
(
"active"
if
params
[
:f
]
==
"closed"
)}
=
link_to
project_merge_requests_path
(
@project
,
f:
"closed"
,
milestone_id:
params
[
:milestone_id
])
do
Closed
%li
{
class:
(
"active"
if
params
[
:f
]
==
'assigned-to-me'
)}
=
link_to
project_merge_requests_path
(
@project
,
f:
'assigned-to-me'
,
milestone_id:
params
[
:milestone_id
])
do
To Me
%li
{
class:
(
"active"
if
params
[
:f
]
==
'all'
)}
=
link_to
project_merge_requests_path
(
@project
,
f:
'all'
,
milestone_id:
params
[
:milestone_id
])
do
All
.right
=
form_tag
project_merge_requests_path
(
@project
),
id:
"merge_requests_search_form"
,
method: :get
,
class: :right
do
=
select_tag
(
:assignee_id
,
options_from_collection_for_select
([
unassigned_filter
]
+
@project
.
users
.
all
,
"id"
,
"name"
,
params
[
:assignee_id
]),
prompt:
"Assignee"
)
=
select_tag
(
:milestone_id
,
options_from_collection_for_select
([
unassigned_filter
]
+
@project
.
milestones
.
order
(
"id desc"
).
all
,
"id"
,
"title"
,
params
[
:milestone_id
]),
prompt:
"Milestone"
)
=
hidden_field_tag
:f
,
params
[
:f
]
.clearfix
%ul
.unstyled
=
render
@merge_requests
...
...
@@ -35,3 +42,7 @@
.span4.right
%span
.cgray.right
#{
@merge_requests
.
total_count
}
merge requests for this filter
:javascript
$
(
function
()
{
merge_requestsPage
();
})
app/views/merge_requests/show/_mr_box.html.haml
浏览文件 @
2d887d91
...
...
@@ -14,9 +14,13 @@
%strong
.author
=
link_to_merge_request_author
(
@merge_request
)
-
if
@merge_request
.
assignee
%cite
.cgray
and
currently assigned to
%cite
.cgray
,
currently assigned to
=
image_tag
gravatar_icon
(
@merge_request
.
assignee_email
),
width:
16
,
class:
"lil_av"
%strong
.author
=
link_to_merge_request_assignee
(
@merge_request
)
-
if
@merge_request
.
milestone
-
milestone
=
@merge_request
.
milestone
%cite
.cgray
and attached to milestone
%strong
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
20
),
project_milestone_path
(
milestone
.
project
,
milestone
)
-
if
@merge_request
.
closed
...
...
app/views/milestones/_milestone.html.haml
浏览文件 @
2d887d91
%li
{
class:
"milestone"
,
id:
dom_id
(
milestone
)
}
.right
-
if
milestone
.
issues
.
any?
%span
.btn.small.disabled.grouped
=
pluralize
milestone
.
issues
.
count
,
'issues'
-
if
milestone
.
issues
.
count
>
0
=
link_to
'Browse Issues'
,
project_issues_path
(
milestone
.
project
,
milestone_id:
milestone
.
id
),
class:
"btn small grouped"
-
if
can?
current_user
,
:admin_milestone
,
milestone
.
project
=
link_to
'Edit'
,
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
class:
"btn small edit-milestone-link grouped"
=
link_to
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
class:
"btn small edit-milestone-link grouped"
do
%i
.icon-edit
Edit
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
project_milestone_path
(
milestone
.
project
,
milestone
)
,
class:
"row_title"
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
project_milestone_path
(
milestone
.
project
,
milestone
)
%small
=
milestone
.
expires_at
%br
.progress.progress-
success.span3
.row
.progress.progress-
info.span4
.bar
{
style:
"width: #{milestone.percent_complete}%;"
}
.span6
-
if
milestone
.
issues
.
any?
=
link_to
project_issues_path
(
milestone
.
project
,
milestone_id:
milestone
.
id
),
class:
"btn very_small"
do
%strong
=
pluralize
milestone
.
issues
.
count
,
'Issue'
-
if
milestone
.
merge_requests
.
any?
=
link_to
project_merge_requests_path
(
milestone
.
project
,
milestone_id:
milestone
.
id
),
class:
"btn very_small"
do
%strong
=
pluralize
milestone
.
issues
.
count
,
'Merge Request'
app/views/milestones/show.html.haml
浏览文件 @
2d887d91
...
...
@@ -31,10 +31,10 @@
%h5
Progress:
%small
#{
@milestone
.
issues
.
closed
.
count
}
closed
#{
@milestone
.
closed_items_
count
}
closed
–
#{
@milestone
.
issues
.
opened
.
count
}
open
.progress.progress-
success
#{
@milestone
.
open_items_
count
}
open
.progress.progress-
info
.bar
{
style:
"width: #{@milestone.percent_complete}%;"
}
...
...
@@ -58,15 +58,28 @@
%span
.badge.badge-info
##{issue.id}
–
=
link_to_gfm
truncate
(
issue
.
title
,
length:
60
),
[
@project
,
issue
]
%br
.span6
%table
%table
.milestone-merge-requests-filter
%thead
%th
Participants
-
@users
.
each
do
|
user
|
%tr
%th
%ul
.nav.nav-pills
%li
.active
=
link_to
(
'Open Merge Requests'
,
'#'
)
%li
=
link_to
(
'All Merge Requests'
,
'#'
)
-
@merge_requests
.
each
do
|
merge_request
|
%tr
{
data:
{
closed:
merge_request
.
closed
}}
%td
=
image_tag
gravatar_icon
(
user
.
email
,
24
),
width:
"24"
=
user
.
name
=
link_to
[
@project
,
merge_request
]
do
%span
.badge.badge-info
##{merge_request.id}
–
=
link_to_gfm
truncate
(
merge_request
.
title
,
length:
60
),
[
@project
,
merge_request
]
%hr
%h6
Participants:
%div
-
@users
.
each
do
|
user
|
=
link_to
tm_path
(
user
.
tm_of
(
@project
)),
class:
'float-link'
do
=
user
.
avatar_image
=
user
.
name
.clearfix
db/migrate/20121026114600_add_milestone_id_to_merge_requests.rb
0 → 100644
浏览文件 @
2d887d91
class
AddMilestoneIdToMergeRequests
<
ActiveRecord
::
Migration
def
change
add_column
:merge_requests
,
:milestone_id
,
:integer
,
:null
=>
true
end
end
db/schema.rb
浏览文件 @
2d887d91
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
201210
0920501
0
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
201210
2611460
0
)
do
create_table
"events"
,
:force
=>
true
do
|
t
|
t
.
string
"target_type"
...
...
@@ -73,6 +73,7 @@ ActiveRecord::Schema.define(:version => 20121009205010) do
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
boolean
"merged"
,
:default
=>
false
,
:null
=>
false
t
.
integer
"state"
,
:default
=>
1
,
:null
=>
false
t
.
integer
"milestone_id"
end
add_index
"merge_requests"
,
[
"project_id"
],
:name
=>
"index_merge_requests_on_project_id"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录