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
facdbd2b
Commit
facdbd2b
authored
Sep 10, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
81e9850b
d7c1af98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
4 deletions
+17
-4
changelogs/unreleased/issue-67127.yml
changelogs/unreleased/issue-67127.yml
+5
-0
doc/api/tags.md
doc/api/tags.md
+6
-3
lib/api/entities.rb
lib/api/entities.rb
+4
-0
spec/fixtures/api/schemas/public_api/v4/tag.json
spec/fixtures/api/schemas/public_api/v4/tag.json
+2
-1
No files found.
changelogs/unreleased/issue-67127.yml
0 → 100644
View file @
facdbd2b
---
title
:
Expose 'protected' field for Tag API endpoint.
merge_request
:
32790
author
:
Andrea Leone
type
:
added
doc/api/tags.md
View file @
facdbd2b
...
...
@@ -46,7 +46,8 @@ Parameters:
},
"name"
:
"v1.0.0"
,
"target"
:
"2695effb5807a22ff3d138d593fd856244e155e7"
,
"message"
:
null
"message"
:
null
,
"protected"
:
true
}
]
```
...
...
@@ -94,7 +95,8 @@ Example Response:
"committer_email"
:
"contact@arthurverschaeve.be"
,
"committed_date"
:
"2015-02-01T21:56:31.000+01:00"
},
"release"
:
null
"release"
:
null
,
"protected"
:
false
}
```
...
...
@@ -138,7 +140,8 @@ Parameters:
},
"name"
:
"v1.0.0"
,
"target"
:
"2695effb5807a22ff3d138d593fd856244e155e7"
,
"message"
:
null
"message"
:
null
,
"protected"
:
false
}
```
...
...
lib/api/entities.rb
View file @
facdbd2b
...
...
@@ -1312,6 +1312,10 @@ module API
options
[
:project
].
releases
.
find_by
(
tag:
repo_tag
.
name
)
end
# rubocop: enable CodeReuse/ActiveRecord
expose
:protected
do
|
repo_tag
,
options
|
::
ProtectedTag
.
protected?
(
options
[
:project
],
repo_tag
.
name
)
end
end
class
Runner
<
Grape
::
Entity
...
...
spec/fixtures/api/schemas/public_api/v4/tag.json
View file @
facdbd2b
...
...
@@ -16,7 +16,8 @@
{
"type"
:
"null"
},
{
"$ref"
:
"release/tag_release.json"
}
]
}
},
"protected"
:
{
"type"
:
"boolean"
}
},
"additionalProperties"
:
false
}
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