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
Léo-Paul Géneau
gitlab-ce
Commits
5b220b38
Commit
5b220b38
authored
Nov 04, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
920551b5
d38dd3c4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
app/models/project.rb
app/models/project.rb
+0
-4
lib/api/labels.rb
lib/api/labels.rb
+3
-3
spec/requests/api/labels_spec.rb
spec/requests/api/labels_spec.rb
+14
-1
No files found.
app/models/project.rb
View file @
5b220b38
...
...
@@ -1067,10 +1067,6 @@ class Project < ActiveRecord::Base
forks
.
count
end
def
find_label
(
name
)
labels
.
find_by
(
name:
name
)
end
def
origin_merge_requests
merge_requests
.
where
(
source_project_id:
self
.
id
)
end
...
...
lib/api/labels.rb
View file @
5b220b38
...
...
@@ -25,7 +25,7 @@ module API
post
':id/labels'
do
authorize!
:admin_label
,
user_project
label
=
user_project
.
find_label
(
params
[
:name
])
label
=
available_labels
.
find_by
(
title:
params
[
:name
])
conflict!
(
'Label already exists'
)
if
label
label
=
user_project
.
labels
.
create
(
declared
(
params
,
include_parent_namespaces:
false
).
to_h
)
...
...
@@ -46,7 +46,7 @@ module API
delete
':id/labels'
do
authorize!
:admin_label
,
user_project
label
=
user_project
.
find_label
(
params
[
:name
])
label
=
user_project
.
labels
.
find_by
(
title:
params
[
:name
])
not_found!
(
'Label'
)
unless
label
present
label
.
destroy
,
with:
Entities
::
Label
,
current_user:
current_user
...
...
@@ -65,7 +65,7 @@ module API
put
':id/labels'
do
authorize!
:admin_label
,
user_project
label
=
user_project
.
find_label
(
params
[
:name
])
label
=
user_project
.
labels
.
find_by
(
title:
params
[
:name
])
not_found!
(
'Label not found'
)
unless
label
update_params
=
declared
(
params
,
...
...
spec/requests/api/labels_spec.rb
View file @
5b220b38
...
...
@@ -82,7 +82,20 @@ describe API::API, api: true do
expect
(
json_response
[
'message'
][
'title'
]).
to
eq
([
'is invalid'
])
end
it
'returns 409 if label already exists'
do
it
'returns 409 if label already exists in group'
do
group
=
create
(
:group
)
group_label
=
create
(
:group_label
,
group:
group
)
project
.
update
(
group:
group
)
post
api
(
"/projects/
#{
project
.
id
}
/labels"
,
user
),
name:
group_label
.
name
,
color:
'#FFAABB'
expect
(
response
).
to
have_http_status
(
409
)
expect
(
json_response
[
'message'
]).
to
eq
(
'Label already exists'
)
end
it
'returns 409 if label already exists in project'
do
post
api
(
"/projects/
#{
project
.
id
}
/labels"
,
user
),
name:
'label1'
,
color:
'#FFAABB'
...
...
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