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
b2f65679
Commit
b2f65679
authored
Mar 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
e349ca13
b0c1bc66
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
3 deletions
+10
-3
CHANGELOG
CHANGELOG
+3
-0
app/mailers/notify.rb
app/mailers/notify.rb
+1
-1
app/services/system_hooks_service.rb
app/services/system_hooks_service.rb
+1
-1
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-0
lib/gitlab/push_data_builder.rb
lib/gitlab/push_data_builder.rb
+1
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+2
-1
No files found.
CHANGELOG
View file @
b2f65679
...
@@ -48,6 +48,9 @@ v 7.9.0 (unreleased)
...
@@ -48,6 +48,9 @@ v 7.9.0 (unreleased)
- Reject access to group/project avatar if the user doesn't have access.
- Reject access to group/project avatar if the user doesn't have access.
- Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update)
- Add database migration to clean group duplicates with same path and name (Make sure you have a backup before update)
- Add GitLab active users count to rake gitlab:check
- Add GitLab active users count to rake gitlab:check
- Starred projects page at dashboard
- Make email display name configurable
- Improve json validation in hook data
v 7.8.2
v 7.8.2
- Fix service migration issue when upgrading from versions prior to 7.3
- Fix service migration issue when upgrading from versions prior to 7.3
...
...
app/mailers/notify.rb
View file @
b2f65679
...
@@ -53,7 +53,7 @@ class Notify < ActionMailer::Base
...
@@ -53,7 +53,7 @@ class Notify < ActionMailer::Base
# The default email address to send emails from
# The default email address to send emails from
def
default_sender_address
def
default_sender_address
address
=
Mail
::
Address
.
new
(
Gitlab
.
config
.
gitlab
.
email_from
)
address
=
Mail
::
Address
.
new
(
Gitlab
.
config
.
gitlab
.
email_from
)
address
.
display_name
=
"GitLab"
address
.
display_name
=
Gitlab
.
config
.
gitlab
.
email_display_name
address
address
end
end
...
...
app/services/system_hooks_service.rb
View file @
b2f65679
...
@@ -41,7 +41,7 @@ class SystemHooksService
...
@@ -41,7 +41,7 @@ class SystemHooksService
path_with_namespace:
model
.
path_with_namespace
,
path_with_namespace:
model
.
path_with_namespace
,
project_id:
model
.
id
,
project_id:
model
.
id
,
owner_name:
owner
.
name
,
owner_name:
owner
.
name
,
owner_email:
owner
.
respond_to?
(
:email
)
?
owner
.
email
:
nil
,
owner_email:
owner
.
respond_to?
(
:email
)
?
owner
.
email
:
""
,
project_visibility:
Project
.
visibility_levels
.
key
(
model
.
visibility_level_field
).
downcase
project_visibility:
Project
.
visibility_levels
.
key
(
model
.
visibility_level_field
).
downcase
})
})
when
User
when
User
...
...
config/gitlab.yml.example
View file @
b2f65679
...
@@ -43,6 +43,7 @@ production: &base
...
@@ -43,6 +43,7 @@ production: &base
# email_enabled: true
# email_enabled: true
# Email address used in the "From" field in mails sent by GitLab
# Email address used in the "From" field in mails sent by GitLab
email_from: example@example.com
email_from: example@example.com
email_display_name: GitLab
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
...
...
config/initializers/1_settings.rb
View file @
b2f65679
...
@@ -102,6 +102,7 @@ Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
...
@@ -102,6 +102,7 @@ Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
Settings
.
gitlab
[
'protocol'
]
||=
Settings
.
gitlab
.
https
?
"https"
:
"http"
Settings
.
gitlab
[
'protocol'
]
||=
Settings
.
gitlab
.
https
?
"https"
:
"http"
Settings
.
gitlab
[
'email_enabled'
]
||=
true
if
Settings
.
gitlab
[
'email_enabled'
].
nil?
Settings
.
gitlab
[
'email_enabled'
]
||=
true
if
Settings
.
gitlab
[
'email_enabled'
].
nil?
Settings
.
gitlab
[
'email_from'
]
||=
"gitlab@
#{
Settings
.
gitlab
.
host
}
"
Settings
.
gitlab
[
'email_from'
]
||=
"gitlab@
#{
Settings
.
gitlab
.
host
}
"
Settings
.
gitlab
[
'email_display_name'
]
||=
"GitLab"
Settings
.
gitlab
[
'url'
]
||=
Settings
.
send
(
:build_gitlab_url
)
Settings
.
gitlab
[
'url'
]
||=
Settings
.
send
(
:build_gitlab_url
)
Settings
.
gitlab
[
'user'
]
||=
'git'
Settings
.
gitlab
[
'user'
]
||=
'git'
Settings
.
gitlab
[
'user_home'
]
||=
begin
Settings
.
gitlab
[
'user_home'
]
||=
begin
...
...
lib/gitlab/push_data_builder.rb
View file @
b2f65679
...
@@ -58,6 +58,7 @@ module Gitlab
...
@@ -58,6 +58,7 @@ module Gitlab
data
[
:commits
]
<<
commit
.
hook_attrs
(
project
)
data
[
:commits
]
<<
commit
.
hook_attrs
(
project
)
end
end
data
[
:commits
]
=
""
if
data
[
:commits
].
count
==
0
data
data
end
end
...
...
spec/mailers/notify_spec.rb
View file @
b2f65679
...
@@ -5,6 +5,7 @@ describe Notify do
...
@@ -5,6 +5,7 @@ describe Notify do
include
EmailSpec
::
Matchers
include
EmailSpec
::
Matchers
include
RepoHelpers
include
RepoHelpers
let
(
:gitlab_sender_display_name
)
{
Gitlab
.
config
.
gitlab
.
email_display_name
}
let
(
:gitlab_sender
)
{
Gitlab
.
config
.
gitlab
.
email_from
}
let
(
:gitlab_sender
)
{
Gitlab
.
config
.
gitlab
.
email_from
}
let
(
:recipient
)
{
create
(
:user
,
email:
'recipient@example.com'
)
}
let
(
:recipient
)
{
create
(
:user
,
email:
'recipient@example.com'
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
...
@@ -23,7 +24,7 @@ describe Notify do
...
@@ -23,7 +24,7 @@ describe Notify do
shared_examples
'an email sent from GitLab'
do
shared_examples
'an email sent from GitLab'
do
it
'is sent from GitLab'
do
it
'is sent from GitLab'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
expect
(
sender
.
display_name
).
to
eq
(
'GitLab'
)
expect
(
sender
.
display_name
).
to
eq
(
gitlab_sender_display_name
)
expect
(
sender
.
address
).
to
eq
(
gitlab_sender
)
expect
(
sender
.
address
).
to
eq
(
gitlab_sender
)
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