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
Jérome Perrin
gitlab-ce
Commits
0fb85939
Commit
0fb85939
authored
Nov 09, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incoming email config defaults
parent
9f055126
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+2
-2
No files found.
CHANGELOG
View file @
0fb85939
...
@@ -24,6 +24,7 @@ v 8.2.0 (unreleased)
...
@@ -24,6 +24,7 @@ v 8.2.0 (unreleased)
- Add "added", "modified" and "removed" properties to commit object in webhook
- 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
- 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
- Allow groups to appear in the search results if the group owner allows it
- Fix incoming email config defaults
v 8.1.3
v 8.1.3
- Spread out runner contacted_at updates
- Spread out runner contacted_at updates
...
...
config/initializers/1_settings.rb
View file @
0fb85939
...
@@ -193,8 +193,8 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_c
...
@@ -193,8 +193,8 @@ Settings.gitlab_ci['builds_path'] = File.expand_path(Settings.gitlab_c
Settings
[
'incoming_email'
]
||=
Settingslogic
.
new
({})
Settings
[
'incoming_email'
]
||=
Settingslogic
.
new
({})
Settings
.
incoming_email
[
'enabled'
]
=
false
if
Settings
.
incoming_email
[
'enabled'
].
nil?
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
[
'port'
]
=
143
if
Settings
.
incoming_email
[
'port'
].
nil?
Settings
.
incoming_email
[
'ssl'
]
=
143
if
Settings
.
incoming_email
[
'ssl'
].
nil?
Settings
.
incoming_email
[
'ssl'
]
=
false
if
Settings
.
incoming_email
[
'ssl'
].
nil?
Settings
.
incoming_email
[
'start_tls'
]
=
143
if
Settings
.
incoming_email
[
'start_tls'
].
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?
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