Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
immerda
Immerda Apps
iapi
Commits
cae9da19
Commit
cae9da19
authored
Nov 01, 2021
by
o
Browse files
Merge branch 'fixDeletionOfFwd' into 'master'
prevent purging when deleting fwd of deleted iaddress See merge request
!59
parents
07e1ebf9
a0205f81
Pipeline
#9334
passed with stage
in 2 minutes and 53 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
lib/iapi/routes/users_admin.rb
View file @
cae9da19
...
...
@@ -117,7 +117,7 @@ class IApi < Sinatra::Base
if
email
=
EmailIaddress
.
by_email
(
email
)
if
fwd
=
email
.
email_forwards
.
where
(
target:
target
).
first
fwd
.
destroy!
email
.
destroy!
if
email
.
unused?
email
.
destroy!
if
email
.
unused?
&&
!
email
.
deleted?
return
json
result:
'success'
end
end
...
...
Write
Preview
Supports
Markdown
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