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
Léo-Paul Géneau
gitlab-ce
Commits
211c06e4
Commit
211c06e4
authored
Jan 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix few test and notify for commit author
parent
6ddacaf9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
app/mailers/notify.rb
app/mailers/notify.rb
+1
-1
features/steps/project/project_browse_git_repo.rb
features/steps/project/project_browse_git_repo.rb
+1
-1
features/steps/shared/note.rb
features/steps/shared/note.rb
+2
-0
No files found.
app/mailers/notify.rb
View file @
211c06e4
...
@@ -68,7 +68,7 @@ class Notify < ActionMailer::Base
...
@@ -68,7 +68,7 @@ class Notify < ActionMailer::Base
@commit
=
@note
.
noteable
@commit
=
@note
.
noteable
@commit
=
CommitDecorator
.
decorate
(
@commit
)
@commit
=
CommitDecorator
.
decorate
(
@commit
)
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
to:
recipient
(
commit_autor_email
)
,
subject:
subject
(
"note for commit
#{
@commit
.
short_id
}
"
,
@commit
.
title
))
mail
(
to:
commit_autor_email
,
subject:
subject
(
"note for commit
#{
@commit
.
short_id
}
"
,
@commit
.
title
))
end
end
def
note_issue_email
(
recipient_id
,
note_id
)
def
note_issue_email
(
recipient_id
,
note_id
)
...
...
features/steps/project/project_browse_git_repo.rb
View file @
211c06e4
...
@@ -14,6 +14,6 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps
...
@@ -14,6 +14,6 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps
Then
'I should see git file blame'
do
Then
'I should see git file blame'
do
page
.
should
have_content
"rubygems.org"
page
.
should
have_content
"rubygems.org"
page
.
should
have_content
"Dmitriy Zaporozhets"
page
.
should
have_content
"Dmitriy Zaporozhets"
page
.
should
have_content
"
bc3735004cb
Moving to rails 3.2"
page
.
should
have_content
"Moving to rails 3.2"
end
end
end
end
features/steps/shared/note.rb
View file @
211c06e4
...
@@ -2,6 +2,7 @@ module SharedNote
...
@@ -2,6 +2,7 @@ module SharedNote
include
Spinach
::
DSL
include
Spinach
::
DSL
Given
'I delete a comment'
do
Given
'I delete a comment'
do
sleep
1
first
(
".js-note-delete"
).
trigger
(
"click"
)
first
(
".js-note-delete"
).
trigger
(
"click"
)
end
end
...
@@ -15,6 +16,7 @@ module SharedNote
...
@@ -15,6 +16,7 @@ module SharedNote
within
(
".js-main-target-form"
)
do
within
(
".js-main-target-form"
)
do
fill_in
"note[note]"
,
with:
"XML attached"
fill_in
"note[note]"
,
with:
"XML attached"
click_button
"Add Comment"
click_button
"Add Comment"
sleep
0.05
end
end
end
end
...
...
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