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
Boxiang Sun
gitlab-ce
Commits
997290fc
Commit
997290fc
authored
Mar 04, 2019
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in spec/mailers/notify_spec.rb
parent
0fc51747
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+0
-10
No files found.
spec/mailers/notify_spec.rb
View file @
997290fc
...
...
@@ -208,15 +208,6 @@ describe Notify do
let
(
:new_issue
)
{
create
(
:issue
)
}
subject
{
described_class
.
issue_moved_email
(
recipient
,
issue
,
new_issue
,
current_user
)
}
<<<<<<<
HEAD
it_behaves_like
'an answer to an existing thread with reply-by-email enabled'
do
let
(
:model
)
{
issue
}
end
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'an unsubscribeable thread'
it_behaves_like
'appearance header and footer enabled'
it_behaves_like
'appearance header and footer not enabled'
=======
context
'when a user has permissions to access the new issue'
do
before
do
new_issue
.
project
.
add_developer
(
recipient
)
...
...
@@ -234,7 +225,6 @@ describe Notify do
it
'has the correct subject and body'
do
new_issue_url
=
project_issue_path
(
new_issue
.
project
,
new_issue
)
>>>>>>>
dev
/
master
aggregate_failures
do
is_expected
.
to
have_referable_subject
(
issue
,
reply:
true
)
...
...
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