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
4d202249
Commit
4d202249
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
factor out a public `#refresh_service_desk_key!`
parent
536b8232
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
app/models/ee/project.rb
app/models/ee/project.rb
+9
-5
No files found.
app/models/ee/project.rb
View file @
4d202249
...
...
@@ -15,7 +15,7 @@ module EE
delegate
:actual_shared_runners_minutes_limit
,
:shared_runners_minutes_used?
,
to: :namespace
before_validation
:refresh_service_desk_key
before_validation
:
auto_
refresh_service_desk_key
end
def
shared_runners_available?
...
...
@@ -30,19 +30,23 @@ module EE
return
nil
unless
::
Gitlab
::
EE
::
ServiceDesk
.
enabled?
return
nil
unless
self
.
service_desk_enabled?
refresh_service_desk_key
if
service_desk_mail_key
.
blank?
refresh_service_desk_key
!
if
service_desk_mail_key
.
blank?
from
=
"service_desk+
#{
service_desk_mail_key
}
"
Gitlab
::
IncomingEmail
.
reply_address
(
from
)
end
private
def
refresh_service_desk_key
def
refresh_service_desk_key!
return
unless
::
Gitlab
::
EE
::
ServiceDesk
.
enabled?
return
unless
self
.
service_desk_enabled?
self
.
service_desk_mail_key
=
Devise
.
friendly_token
(
16
)
end
private
def
auto_refresh_service_desk_key
if
service_desk_mail_key
.
blank?
||
service_desk_enabled_changed?
self
.
service_desk_mail_key
=
Devise
.
friendly_token
(
16
)
refresh_service_desk_key!
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