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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
cd6ca1b6
Commit
cd6ca1b6
authored
Nov 09, 2016
by
Alejandro Rodríguez
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'ce/master'
parents
a21d91e2
b900bb9b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
changelogs/unreleased/api-label-priorities.yml
changelogs/unreleased/api-label-priorities.yml
+1
-1
spec/models/group_label_spec.rb
spec/models/group_label_spec.rb
+1
-1
spec/requests/api/labels_spec.rb
spec/requests/api/labels_spec.rb
+1
-1
No files found.
changelogs/unreleased/api-label-priorities.yml
View file @
cd6ca1b6
---
title
:
API
:
Ability to retrieve version information
title
:
"
API:
Ability
to
retrieve
version
information"
merge_request
:
7286
author
:
Robert Schilling
spec/models/group_label_spec.rb
View file @
cd6ca1b6
...
...
@@ -18,7 +18,7 @@ describe GroupLabel, models: true do
end
describe
'#to_reference'
do
let
(
:label
)
{
create
(
:group_label
)
}
let
(
:label
)
{
create
(
:group_label
,
title:
'feature'
)
}
context
'using id'
do
it
'returns a String reference to the object'
do
...
...
spec/requests/api/labels_spec.rb
View file @
cd6ca1b6
...
...
@@ -15,7 +15,7 @@ describe API::API, api: true do
describe
'GET /projects/:id/labels'
do
it
'returns all available labels to the project'
do
group
=
create
(
:group
)
group_label
=
create
(
:group_label
,
group:
group
)
group_label
=
create
(
:group_label
,
title:
'feature'
,
group:
group
)
project
.
update
(
group:
group
)
expected_keys
=
[
'id'
,
'name'
,
'color'
,
'description'
,
...
...
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