diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 12:43:32 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-20 12:43:32 +0100 |
| commit | eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a (patch) | |
| tree | 9dc7d17953ee7851e1934903b45faf5f18d860a2 /lib/api/merge_requests.rb | |
| parent | 1b97a2eee8b89320de891e3ae8496adfa7f3a84b (diff) | |
| parent | b7ac654b88aa9b03f431d93c25e397ff2bc66a7a (diff) | |
| download | gitlab-ce-eefb27f5ae0edf0c005eb8ce6da56cbd17c9aa8a.tar.gz | |
Merge branch 'master' into fixes/api
Conflicts:
spec/requests/api/projects_spec.rb
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 0c18ece3824..4b28094f1a4 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -91,12 +91,12 @@ module Gitlab # target_branch - The target branch # assignee_id - Assignee user ID # title - Title of MR - # closed - Status of MR. true - closed + # state_event - Status of MR. (close|reopen|merge) # Example: # PUT /projects/:id/merge_request/:merge_request_id # put ":id/merge_request/:merge_request_id" do - attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :closed] + attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event] merge_request = user_project.merge_requests.find(params[:merge_request_id]) authorize! :modify_merge_request, merge_request |