Download as
Browse Code »

Commit 63e6f055f12a5f955ae3bb7f27b562f89efbd8bb

Authored by Dmitriy Zaporozhets
1 parent 2f585840
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix notify specs. Fix merge request close via api

Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
lib/api/merge_requests.rb
  Diff comments   View file @63e6f05
@@ -94,6 +94,8 @@ module Gitlab @@ -94,6 +94,8 @@ module Gitlab
94 94
95 authorize! :modify_merge_request, merge_request 95 authorize! :modify_merge_request, merge_request
96 96
  97 + MergeRequestObserver.current_user = current_user
  98 +
97 if merge_request.update_attributes attrs 99 if merge_request.update_attributes attrs
98 merge_request.reload_code 100 merge_request.reload_code
99 merge_request.mark_as_unchecked 101 merge_request.mark_as_unchecked
spec/mailers/notify_spec.rb
  Diff comments   View file @63e6f05
@@ -107,7 +107,7 @@ describe Notify do @@ -107,7 +107,7 @@ describe Notify do
107 let(:issue) { create(:issue, assignee: assignee, project: project ) } 107 let(:issue) { create(:issue, assignee: assignee, project: project ) }
108 108
109 describe 'that are new' do 109 describe 'that are new' do
110 - subject { Notify.new_issue_email(issue.id) } 110 + subject { Notify.new_issue_email(issue.assignee_id, issue.id) }
111 111
112 it_behaves_like 'an assignee email' 112 it_behaves_like 'an assignee email'
113 113
@@ -172,7 +172,7 @@ describe Notify do @@ -172,7 +172,7 @@ describe Notify do
172 let(:merge_request) { create(:merge_request, assignee: assignee, project: project) } 172 let(:merge_request) { create(:merge_request, assignee: assignee, project: project) }
173 173
174 describe 'that are new' do 174 describe 'that are new' do
175 - subject { Notify.new_merge_request_email(merge_request.id) } 175 + subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
176 176
177 it_behaves_like 'an assignee email' 177 it_behaves_like 'an assignee email'
178 178