BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b740bfc2
Commit
b740bfc2
authored
Nov 09, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-incoming-email-default' into 'master'
Fix incoming email config defaults Fixes #3377. See merge request !1766
parents
62769e20
0fb85939
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
1_settings.rb
config/initializers/1_settings.rb
+2
-2
No files found.
CHANGELOG
View file @
b740bfc2
...
...
@@ -26,6 +26,7 @@ v 8.2.0 (unreleased)
- Add "added", "modified" and "removed" properties to commit object in webhook
- Rename "Back to" links to "Go to" because its not always a case it point to place user come from
- Allow groups to appear in the search results if the group owner allows it
- Fix incoming email config defaults
v 8.1.3
- Spread out runner contacted_at updates
...
...
config/initializers/1_settings.rb
View file @
b740bfc2
...
...
@@ -193,8 +193,8 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_c
Settings
[
'incoming_email'
]
||=
Settingslogic
.
new
({})
Settings
.
incoming_email
[
'enabled'
]
=
false
if
Settings
.
incoming_email
[
'enabled'
].
nil?
Settings
.
incoming_email
[
'port'
]
=
143
if
Settings
.
incoming_email
[
'port'
].
nil?
Settings
.
incoming_email
[
'ssl'
]
=
143
if
Settings
.
incoming_email
[
'ssl'
].
nil?
Settings
.
incoming_email
[
'start_tls'
]
=
143
if
Settings
.
incoming_email
[
'start_tls'
].
nil?
Settings
.
incoming_email
[
'ssl'
]
=
false
if
Settings
.
incoming_email
[
'ssl'
].
nil?
Settings
.
incoming_email
[
'start_tls'
]
=
false
if
Settings
.
incoming_email
[
'start_tls'
].
nil?
Settings
.
incoming_email
[
'mailbox'
]
=
"inbox"
if
Settings
.
incoming_email
[
'mailbox'
].
nil?
#
...
...
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