summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 13:24:01 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-28 13:24:01 +0200
commit63e6f055f12a5f955ae3bb7f27b562f89efbd8bb (patch)
treeb7fab87865bfdfbd70d603e432e0f7ce749414dc /lib
parent2f585840dbf4910d3a4b40c1771ff1dd4525625d (diff)
downloadgitlab-ce-63e6f055f12a5f955ae3bb7f27b562f89efbd8bb.tar.gz
Fix notify specs. Fix merge request close via api
Diffstat (limited to 'lib')
-rw-r--r--lib/api/merge_requests.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 234a005a998..d5595d5f16b 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -94,6 +94,8 @@ module Gitlab
authorize! :modify_merge_request, merge_request
+ MergeRequestObserver.current_user = current_user
+
if merge_request.update_attributes attrs
merge_request.reload_code
merge_request.mark_as_unchecked