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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
9b3fabcc
Commit
9b3fabcc
authored
Nov 25, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mail host url to email.yml
parent
a8e4fb61
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
app/mailers/notify.rb
app/mailers/notify.rb
+7
-7
config/email.yml
config/email.yml
+1
-0
No files found.
app/mailers/notify.rb
View file @
9b3fabcc
class
Notify
<
ActionMailer
::
Base
class
Notify
<
ActionMailer
::
Base
default_url_options
[
:host
]
=
"gitlabhq.com"
default_url_options
[
:host
]
=
EMAIL_OPTS
[
"host"
]
default
from:
"notify@gitlabhq.com"
default
from:
EMAIL_OPTS
[
"from"
]
def
new_user_email
(
user
,
password
)
def
new_user_email
(
user
,
password
)
@user
=
user
@user
=
user
@password
=
password
@password
=
password
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | Account was created for you"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | Account was created for you"
)
end
end
def
new_issue_email
(
issue
)
def
new_issue_email
(
issue
)
...
@@ -13,14 +13,14 @@ class Notify < ActionMailer::Base
...
@@ -13,14 +13,14 @@ class Notify < ActionMailer::Base
@project
=
issue
.
project
@project
=
issue
.
project
@issue
=
issue
@issue
=
issue
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | New Issue was created"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | New Issue was created"
)
end
end
def
note_wall_email
(
user
,
note
)
def
note_wall_email
(
user
,
note
)
@user
=
user
@user
=
user
@note
=
note
@note
=
note
@project
=
note
.
project
@project
=
note
.
project
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
)
end
end
def
note_commit_email
(
user
,
note
)
def
note_commit_email
(
user
,
note
)
...
@@ -28,7 +28,7 @@ class Notify < ActionMailer::Base
...
@@ -28,7 +28,7 @@ class Notify < ActionMailer::Base
@note
=
note
@note
=
note
@project
=
note
.
project
@project
=
note
.
project
@commit
=
@project
.
repo
.
commits
(
note
.
noteable_id
).
first
@commit
=
@project
.
repo
.
commits
(
note
.
noteable_id
).
first
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
)
end
end
def
note_issue_email
(
user
,
note
)
def
note_issue_email
(
user
,
note
)
...
@@ -36,6 +36,6 @@ class Notify < ActionMailer::Base
...
@@ -36,6 +36,6 @@ class Notify < ActionMailer::Base
@note
=
note
@note
=
note
@project
=
note
.
project
@project
=
note
.
project
@issue
=
note
.
noteable
@issue
=
note
.
noteable
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
)
end
end
end
end
config/email.yml
View file @
9b3fabcc
from
:
notify@gitlabhq.com
from
:
notify@gitlabhq.com
host
:
gitlabhq.com
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