Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-13 01:52:02 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-13 01:52:02 +0300
commit8f53094f0f22fe208f6f6e0d39037188bf14a937 (patch)
treee2cba2f3521e18ea4da2891e6fcee85de526fcdc /lib/api
parentba34045f3120fc52ce714d49778a24c647248500 (diff)
Add API docs and correctly expose release api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities.rb50
-rw-r--r--lib/api/tags.rb2
2 files changed, 26 insertions, 26 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 7528e718c6f..3ca632dfae9 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -95,31 +95,6 @@ module API
end
end
- class RepoTag < Grape::Entity
- expose :name
- expose :message do |repo_obj, _options|
- if repo_obj.respond_to?(:message)
- repo_obj.message
- else
- nil
- end
- end
-
- expose :commit do |repo_obj, options|
- if repo_obj.respond_to?(:commit)
- repo_obj.commit
- elsif options[:project]
- options[:project].repository.commit(repo_obj.target)
- end
- end
-
- expose :release do |repo_obj, options|
- if options[:project]
- options[:project].releases.find_by(tag: repo_obj.name)
- end
- end
- end
-
class RepoObject < Grape::Entity
expose :name
@@ -351,5 +326,30 @@ module API
class Release < Grape::Entity
expose :tag, :description
end
+
+ class RepoTag < Grape::Entity
+ expose :name
+ expose :message do |repo_obj, _options|
+ if repo_obj.respond_to?(:message)
+ repo_obj.message
+ else
+ nil
+ end
+ end
+
+ expose :commit do |repo_obj, options|
+ if repo_obj.respond_to?(:commit)
+ repo_obj.commit
+ elsif options[:project]
+ options[:project].repository.commit(repo_obj.target)
+ end
+ end
+
+ expose :release, using: Entities::Release do |repo_obj, options|
+ if options[:project]
+ options[:project].releases.find_by(tag: repo_obj.name)
+ end
+ end
+ end
end
end
diff --git a/lib/api/tags.rb b/lib/api/tags.rb
index 06fa1d23fd6..673342dd447 100644
--- a/lib/api/tags.rb
+++ b/lib/api/tags.rb
@@ -29,7 +29,7 @@ module API
authorize_push_project
message = params[:message] || nil
result = CreateTagService.new(user_project, current_user).
- execute(params[:tag_name], params[:ref], message)
+ execute(params[:tag_name], params[:ref], message, params[:release_description])
if result[:status] == :success
present result[:tag],