From dcdc09d864e30a1cd47d308f17858ac92821495f Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 9 Aug 2016 15:02:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9gitlab=20api=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 2 +- lib/gitlab-cli/lib/gitlab/client/merge_requests.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 7dc6b7b53..a1f77dffa 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -148,7 +148,7 @@ class PullRequestsController < ApplicationController def create_pull_request_comment content = params[:pull_request_comment] begin - @comments = @g.create_merge_request_comment(@project.gpid, params[:id], content) + @comments = @g.create_merge_request_comment(@project.gpid, params[:id], content, User.current.gid) respond_to do |format| format.html{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)} end diff --git a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb index 2006c58bf..b6a9ed051 100644 --- a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb +++ b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb @@ -78,8 +78,8 @@ class Gitlab::Client # @param [Integer] id The ID of a merge request. # @param [String] note The content of a comment. # @return [Gitlab::ObjectifiedHash] Information about created merge request comment. - def create_merge_request_comment(project, id, note) - post("/projects/#{project}/merge_request/#{id}/comments", :body => {:note => note}) + def create_merge_request_comment(project, id, note, gid) + post("/projects/#{project}/merge_request/#{id}/comments?user_id=#{gid}", :body => {:note => note}) end # Get a list of merge request commits.