summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-04-16 10:23:36 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2016-04-17 11:03:10 +0200
commitfa7d99ebd4cd86134e33f9f79e2b92f50de3af6c (patch)
treea7f4f33287fc01c2f11d079c7aacbf62d1e9dcd2
parent5048064dc5e7ca30f65209c7ccd9fb90f9ac49db (diff)
downloadgitlab-ce-fa7d99ebd4cd86134e33f9f79e2b92f50de3af6c.tar.gz
API: Present an array of Gitlab::Git::Tag instead of array of rugged tags
-rw-r--r--CHANGELOG1
-rw-r--r--lib/api/tags.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d8fbfafb72c..7fa1fce1f2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -73,6 +73,7 @@ v 8.7.0 (unreleased)
- Diffs load at the correct point when linking from from number
- Selected diff rows highlight
- Fix emoji categories in the emoji picker
+ - API: Properly display annotated tags for GET /projects/:id/repository/tags (Robert Schilling)
- Add encrypted credentials for imported projects and migrate old ones
- Author and participants are displayed first on users autocompletion
diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index d1a10479e44..3e1ed3fe5c7 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -12,7 +12,7 @@ module API
# Example Request:
# GET /projects/:id/repository/tags
get ":id/repository/tags" do
- present user_project.repo.tags.sort_by(&:name).reverse,
+ present user_project.repository.tags.sort_by(&:name).reverse,
with: Entities::RepoTag, project: user_project
end