Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d61268e4
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d61268e4
编写于
11月 22, 2011
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[#169] – Move email 'from' & 'host' settings to config file
上级
a4fbe13f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
5 deletion
+7
-5
app/mailers/notify.rb
app/mailers/notify.rb
+5
-5
config/email.yml
config/email.yml
+1
-0
config/initializers/load_config.rb
config/initializers/load_config.rb
+1
-0
未找到文件。
app/mailers/notify.rb
浏览文件 @
d61268e4
...
...
@@ -5,7 +5,7 @@ class Notify < ActionMailer::Base
def
new_user_email
(
user
,
password
)
@user
=
user
@password
=
password
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | Account was created for you"
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | Account was created for you"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
end
def
new_issue_email
(
issue
)
...
...
@@ -13,14 +13,14 @@ class Notify < ActionMailer::Base
@project
=
issue
.
project
@issue
=
issue
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | New Issue was created"
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab | New Issue was created"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
end
def
note_wall_email
(
user
,
note
)
@user
=
user
@note
=
note
@project
=
note
.
project
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
end
def
note_commit_email
(
user
,
note
)
...
...
@@ -28,7 +28,7 @@ class Notify < ActionMailer::Base
@note
=
note
@project
=
note
.
project
@commit
=
@project
.
repo
.
commits
(
note
.
noteable_id
).
first
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
end
def
note_issue_email
(
user
,
note
)
...
...
@@ -36,6 +36,6 @@ class Notify < ActionMailer::Base
@note
=
note
@project
=
note
.
project
@issue
=
note
.
noteable
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
)
mail
(
:to
=>
@user
.
email
,
:subject
=>
"gitlab |
#{
@note
.
project
.
name
}
"
,
:from
=>
EMAIL_OPTS
[
"from"
]
)
end
end
config/email.yml
0 → 100644
浏览文件 @
d61268e4
from
:
notify@gitlabhq.com
config/initializers/load_config.rb
浏览文件 @
d61268e4
GITOSIS
=
YAML
.
load_file
(
"
#{
Rails
.
root
}
/config/gitosis.yml"
)
EMAIL_OPTS
=
YAML
.
load_file
(
"
#{
Rails
.
root
}
/config/email.yml"
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录