Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
63e6f055
Commit
63e6f055
authored
Mar 28, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix notify specs. Fix merge request close via api
parent
2f585840
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+2
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+2
-2
No files found.
lib/api/merge_requests.rb
View file @
63e6f055
...
@@ -94,6 +94,8 @@ module Gitlab
...
@@ -94,6 +94,8 @@ module Gitlab
authorize!
:modify_merge_request
,
merge_request
authorize!
:modify_merge_request
,
merge_request
MergeRequestObserver
.
current_user
=
current_user
if
merge_request
.
update_attributes
attrs
if
merge_request
.
update_attributes
attrs
merge_request
.
reload_code
merge_request
.
reload_code
merge_request
.
mark_as_unchecked
merge_request
.
mark_as_unchecked
...
...
spec/mailers/notify_spec.rb
View file @
63e6f055
...
@@ -107,7 +107,7 @@ describe Notify do
...
@@ -107,7 +107,7 @@ describe Notify do
let
(
:issue
)
{
create
(
:issue
,
assignee:
assignee
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
assignee:
assignee
,
project:
project
)
}
describe
'that are new'
do
describe
'that are new'
do
subject
{
Notify
.
new_issue_email
(
issue
.
id
)
}
subject
{
Notify
.
new_issue_email
(
issue
.
assignee_id
,
issue
.
id
)
}
it_behaves_like
'an assignee email'
it_behaves_like
'an assignee email'
...
@@ -172,7 +172,7 @@ describe Notify do
...
@@ -172,7 +172,7 @@ describe Notify do
let
(
:merge_request
)
{
create
(
:merge_request
,
assignee:
assignee
,
project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
assignee:
assignee
,
project:
project
)
}
describe
'that are new'
do
describe
'that are new'
do
subject
{
Notify
.
new_merge_request_email
(
merge_request
.
id
)
}
subject
{
Notify
.
new_merge_request_email
(
merge_request
.
assignee_id
,
merge_request
.
id
)
}
it_behaves_like
'an assignee email'
it_behaves_like
'an assignee email'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment