Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
a2da6172a613
Commit
a2da6172
authored
Apr 14, 2014
by
Drew Blessing
Browse files
Implement Merge Request Labels
parent
6fe754b6c7a4
Changes
15
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/sections/merge_requests.scss
View file @
a2da6172
...
...
@@ -74,6 +74,10 @@
.merge-request-info
{
color
:
#999
;
.merge-request-labels
{
display
:
inline-block
;
}
}
}
}
...
...
@@ -112,3 +116,7 @@
}
}
}
.merge-request-show-labels
.label
{
padding
:
6px
10px
;
}
app/controllers/application_controller.rb
View file @
a2da6172
...
...
@@ -117,6 +117,11 @@
return
access_denied!
unless
can?
(
current_user
,
:push_code
,
project
)
end
def
authorize_labels!
# Labels should be accessible for issues and/or merge requests
authorize_read_issue!
||
authorize_read_merge_request!
end
def
access_denied!
render
"errors/access_denied"
,
layout:
"errors"
,
status:
404
end
...
...
app/controllers/projects/labels_controller.rb
View file @
a2da6172
class
Projects::LabelsController
<
Projects
::
ApplicationController
before_filter
:module_enabled
# Allow read any issue
before_filter
:authorize_read_issue!
before_filter
:authorize_labels!
respond_to
:js
,
:html
...
...
@@ -13,9 +12,13 @@
def
generate
Gitlab
::
IssuesLabels
.
generate
(
@project
)
redirect_to
project_issues_path
(
@project
)
if
params
[
:redirect
]
==
'issues'
redirect_to
project_issues_path
(
@project
)
elsif
params
[
:redirect
]
==
'merge_requests'
redirect_to
project_merge_requests_path
(
@project
)
end
end
protected
def
module_enabled
...
...
@@ -17,8 +20,10 @@
end
protected
def
module_enabled
return
render_404
unless
@project
.
issues_enabled
unless
@project
.
issues_enabled
||
@project
.
merge_requests_enabled
return
render_404
end
end
end
app/models/merge_request.rb
View file @
a2da6172
...
...
@@ -36,7 +36,9 @@
delegate
:commits
,
:diffs
,
:last_commit
,
:last_commit_short_sha
,
to: :merge_request_diff
,
prefix:
nil
attr_accessible
:title
,
:assignee_id
,
:source_project_id
,
:source_branch
,
:target_project_id
,
:target_branch
,
:milestone_id
,
:state_event
,
:description
attr_accessible
:title
,
:assignee_id
,
:source_project_id
,
:source_branch
,
:target_project_id
,
:target_branch
,
:milestone_id
,
:state_event
,
:description
,
:label_list
attr_accessor
:should_remove_source_branch
...
...
@@ -44,6 +46,9 @@
# It allows us to close or modify broken merge requests
attr_accessor
:allow_broken
ActsAsTaggableOn
.
strict_case_match
=
true
acts_as_taggable_on
:labels
state_machine
:state
,
initial: :opened
do
event
:close
do
transition
[
:reopened
,
:opened
]
=>
:closed
...
...
app/models/project.rb
View file @
a2da6172
...
...
@@ -281,4 +281,5 @@
self
.
id
end
# Tags are shared by issues and merge requests
def
issues_labels
...
...
@@ -284,5 +285,7 @@
def
issues_labels
@issues_labels
||=
(
issues_default_labels
+
issues
.
tags_on
(
:labels
)).
uniq
.
sort_by
(
&
:name
)
@issues_labels
||=
(
issues_default_labels
+
merge_requests
.
tags_on
(
:labels
)
+
issues
.
tags_on
(
:labels
)).
uniq
.
sort_by
(
&
:name
)
end
def
issue_exists?
(
issue_id
)
...
...
app/views/projects/issues/index.html.haml
View file @
a2da6172
=
render
"head"
.row
.col-md-3
=
render
'shared/project_filter'
,
project_entities_path:
project_issues_path
(
@project
),
labels:
true
=
render
'shared/project_filter'
,
project_entities_path:
project_issues_path
(
@project
),
labels:
true
,
redirect:
'issues'
.col-md-9.issues-holder
=
render
"issues"
app/views/projects/merge_requests/_form.html.haml
View file @
a2da6172
...
...
@@ -52,6 +52,15 @@
=
f
.
text_area
:description
,
class:
"form-control js-gfm-input"
,
rows:
14
%p
.hint
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
-
if
@merge_request
.
persisted?
# Only allow labels on edit to avoid fork vs upstream repo labels issue
.form-group
=
f
.
label
:label_list
,
class:
'control-label'
do
%i
.icon-tag
Labels
.col-sm-10
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"form-control"
%p
.hint
Separate labels with commas.
.form-actions
-
if
@merge_request
.
new_record?
=
f
.
submit
'Submit merge request'
,
class:
"btn btn-create"
...
...
@@ -83,3 +92,32 @@
target_branch
.
on
(
"
change
"
,
function
()
{
$
.
get
(
"
#{
branch_to_project_merge_requests_path
(
@source_project
)
}
"
,
{
target_project_id
:
target_project
.
val
(),
ref
:
$
(
this
).
val
()
});
});
$
(
"
#merge_request_label_list
"
)
.
bind
(
"
keydown
"
,
function
(
event
)
{
if
(
event
.
keyCode
===
$
.
ui
.
keyCode
.
TAB
&&
$
(
this
).
data
(
"
autocomplete
"
).
menu
.
active
)
{
event
.
preventDefault
();
}
})
.
bind
(
"
click
"
,
function
(
event
)
{
$
(
this
).
autocomplete
(
"
search
"
,
""
);
})
.
autocomplete
({
minLength
:
0
,
source
:
function
(
request
,
response
)
{
response
(
$
.
ui
.
autocomplete
.
filter
(
#{
raw
labels_autocomplete_source
}
,
extractLast
(
request
.
term
)
)
);
},
focus
:
function
()
{
return
false
;
},
select
:
function
(
event
,
ui
)
{
var
terms
=
split
(
this
.
value
);
terms
.
pop
();
terms
.
push
(
ui
.
item
.
value
);
terms
.
push
(
""
);
this
.
value
=
terms
.
join
(
"
,
"
);
return
false
;
}
});
app/views/projects/merge_requests/_merge_request.html.haml
View file @
a2da6172
...
...
@@ -35,3 +35,9 @@
.pull-right
%small
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
'bottom'
,
'merge_request_updated_ago'
)
}
.merge-request-labels
-
merge_request
.
labels
.
each
do
|
label
|
%span
{
class:
"label #{label_css_class(label.name)}"
}
%i
.icon-tag
=
label
.
name
app/views/projects/merge_requests/_show.html.haml
View file @
a2da6172
...
...
@@ -4,6 +4,7 @@
=
render
"projects/merge_requests/show/mr_box"
=
render
"projects/merge_requests/show/state_widget"
=
render
"projects/merge_requests/show/commits"
=
render
"projects/merge_requests/show/participants"
-
if
@commits
.
present?
%ul
.nav.nav-tabs
...
...
app/views/projects/merge_requests/index.html.haml
View file @
a2da6172
...
...
@@ -8,7 +8,8 @@
%hr
.row
.col-md-3
=
render
'shared/project_filter'
,
project_entities_path:
project_merge_requests_path
(
@project
)
=
render
'shared/project_filter'
,
project_entities_path:
project_merge_requests_path
(
@project
),
labels:
true
,
redirect:
'merge_requests'
.col-md-9
.mr-filters.append-bottom-10
.dropdown.inline
...
...
app/views/projects/merge_requests/show/_participants.html.haml
0 → 100644
View file @
a2da6172
.participants
%cite
.cgray
#{
@merge_request
.
participants
.
count
}
participants
-
@merge_request
.
participants
.
each
do
|
participant
|
=
link_to_member
(
@project
,
participant
,
name:
false
,
size:
24
)
.merge-request-show-labels.pull-right
-
@merge_request
.
labels
.
each
do
|
label
|
%span
{
class:
"label #{label_css_class(label.name)}"
}
%i
.icon-tag
=
label
.
name
app/views/shared/_project_filter.html.haml
View file @
a2da6172
...
...
@@ -44,7 +44,7 @@
.light-well
Add first label to your issues
%br
or
#{
link_to
'generate'
,
generate_project_labels_path
(
@project
),
method: :post
}
default set of labels
or
#{
link_to
'generate'
,
generate_project_labels_path
(
@project
,
redirect:
redirect
),
method: :post
}
default set of labels
%fieldset
-
if
%w(state scope milestone_id assignee_id label_name)
.
select
{
|
k
|
params
[
k
].
present?
}.
any?
...
...
lib/api/entities.rb
View file @
a2da6172
...
...
@@ -135,6 +135,7 @@
expose
:target_branch
,
:source_branch
,
:upvotes
,
:downvotes
expose
:author
,
:assignee
,
using:
Entities
::
UserBasic
expose
:source_project_id
,
:target_project_id
expose
:label_list
,
as: :labels
end
class
SSHKey
<
Grape
::
Entity
...
...
lib/api/merge_requests.rb
View file @
a2da6172
...
...
@@ -67,6 +67,7 @@
# assignee_id - Assignee user ID
# title (required) - Title of MR
# description - Description of MR
# labels (optional) - Labels for MR as a comma-separated list
#
# Example:
# POST /projects/:id/merge_requests
...
...
@@ -75,6 +76,7 @@
authorize!
:write_merge_request
,
user_project
required_attributes!
[
:source_branch
,
:target_branch
,
:title
]
attrs
=
attributes_for_keys
[
:source_branch
,
:target_branch
,
:assignee_id
,
:title
,
:target_project_id
,
:description
]
attrs
[
:label_list
]
=
params
[
:labels
]
if
params
[
:labels
].
present?
merge_request
=
::
MergeRequests
::
CreateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
if
merge_request
.
valid?
...
...
@@ -95,8 +97,9 @@
# title - Title of MR
# state_event - Status of MR. (close|reopen|merge)
# description - Description of MR
# labels (optional) - Labels for a MR as a comma-separated list
# Example:
# PUT /projects/:id/merge_request/:merge_request_id
#
put
":id/merge_request/:merge_request_id"
do
attrs
=
attributes_for_keys
[
:source_branch
,
:target_branch
,
:assignee_id
,
:title
,
:state_event
,
:description
]
...
...
@@ -98,8 +101,9 @@
# Example:
# PUT /projects/:id/merge_request/:merge_request_id
#
put
":id/merge_request/:merge_request_id"
do
attrs
=
attributes_for_keys
[
:source_branch
,
:target_branch
,
:assignee_id
,
:title
,
:state_event
,
:description
]
attrs
[
:label_list
]
=
params
[
:labels
]
if
params
[
:labels
].
present?
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
authorize!
:modify_merge_request
,
merge_request
merge_request
=
::
MergeRequests
::
UpdateService
.
new
(
user_project
,
current_user
,
attrs
).
execute
(
merge_request
)
...
...
spec/requests/api/projects_spec.rb
View file @
a2da6172
...
...
@@ -14,6 +14,12 @@
let
(
:users_project
)
{
create
(
:users_project
,
user:
user
,
project:
project
,
project_access:
UsersProject
::
MASTER
)
}
let
(
:users_project2
)
{
create
(
:users_project
,
user:
user3
,
project:
project
,
project_access:
UsersProject
::
DEVELOPER
)
}
let
(
:issue_with_labels
)
{
create
(
:issue
,
author:
user
,
assignee:
user
,
project:
project
,
:label_list
=>
"label1, label2"
)
}
let
(
:merge_request_with_labels
)
do
create
(
:merge_request
,
:simple
,
author:
user
,
assignee:
user
,
source_project:
project
,
target_project:
project
,
title:
'Test'
,
label_list:
'label3, label4'
)
end
describe
"GET /projects"
do
before
{
project
}
...
...
@@ -634,6 +640,19 @@
end
end
describe
"GET /projects/:id/labels"
do
before
{
issue_with_labels
}
describe
'GET /projects/:id/labels'
do
context
'with an issue'
do
before
{
issue_with_labels
}
it
'should return project labels'
do
get
api
(
"/projects/
#{
project
.
id
}
/labels"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'name'
].
should
==
issue_with_labels
.
labels
.
first
.
name
json_response
.
last
[
'name'
].
should
==
issue_with_labels
.
labels
.
last
.
name
end
end
context
'with a merge request'
do
before
{
merge_request_with_labels
}
...
...
@@ -639,10 +658,27 @@
it
"should return project labels"
do
get
api
(
"/projects/
#{
project
.
id
}
/labels"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'name'
].
should
==
issue_with_labels
.
labels
.
first
.
name
json_response
.
last
[
'name'
].
should
==
issue_with_labels
.
labels
.
last
.
name
it
'should return project labels'
do
get
api
(
"/projects/
#{
project
.
id
}
/labels"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'name'
].
should
==
merge_request_with_labels
.
labels
.
first
.
name
json_response
.
last
[
'name'
].
should
==
merge_request_with_labels
.
labels
.
last
.
name
end
end
context
'with an issue and a merge request'
do
before
do
issue_with_labels
merge_request_with_labels
end
it
'should return project labels from both'
do
get
api
(
"/projects/
#{
project
.
id
}
/labels"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
all_labels
=
issue_with_labels
.
labels
.
map
(
&
:name
).
to_a
.
concat
(
merge_request_with_labels
.
labels
.
map
(
&
:name
).
to_a
)
json_response
.
map
{
|
e
|
e
[
'name'
]
}.
should
=~
all_labels
end
end
end
end
Write
Preview
Supports
Markdown
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