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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
265bd122
Commit
265bd122
authored
Apr 03, 2017
by
http://jneen.net/
Committed by
Felipe Artur
Apr 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do away with the static settings
parent
2145c8c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
app/models/ee/user.rb
app/models/ee/user.rb
+1
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+0
-7
No files found.
app/models/ee/user.rb
View file @
265bd122
...
...
@@ -19,7 +19,7 @@ module EE
module
ClassMethods
def
support_bot
email
=
Settings
.
service_desk
.
email
||
"support%s@
#{
Settings
.
gitlab
.
host
}
"
email
_pattern
=
"support%s@
#{
Settings
.
gitlab
.
host
}
"
unique_internal
(
where
(
support_bot:
true
),
'support-bot'
,
email
)
do
|
u
|
u
.
bio
=
'The GitLab support bot'
...
...
config/initializers/1_settings.rb
View file @
265bd122
...
...
@@ -554,13 +554,6 @@ Settings.webpack.dev_server['enabled'] ||= false
Settings
.
webpack
.
dev_server
[
'host'
]
||=
'localhost'
Settings
.
webpack
.
dev_server
[
'port'
]
||=
3808
#
# ServiceDesk settings
#
Settings
[
'service_desk'
]
||=
Settingslogic
.
new
({})
Settings
.
service_desk
[
'user'
]
||=
nil
Settings
.
service_desk
[
'email'
]
||=
nil
#
# Testing settings
#
...
...
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