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
3bab585b
Commit
3bab585b
authored
Jun 19, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update to use emails destroy service
parent
ad44af2f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
6 deletions
+7
-6
users_controller.rb
app/controllers/admin/users_controller.rb
+1
-1
emails_controller.rb
app/controllers/profiles/emails_controller.rb
+1
-1
user.rb
app/models/user.rb
+1
-1
destroy_service.rb
app/services/emails/destroy_service.rb
+1
-1
users.rb
lib/api/users.rb
+3
-2
No files found.
app/controllers/admin/users_controller.rb
View file @
3bab585b
...
...
@@ -152,7 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
def
remove_email
email
=
user
.
emails
.
find
(
params
[
:email_id
])
email
.
destroy
Emails
::
DestroyService
.
new
(
current_user
,
self
,
email:
email
.
email
).
execute
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
).
execute
do
|
user
|
user
.
update_secondary_emails!
...
...
app/controllers/profiles/emails_controller.rb
View file @
3bab585b
...
...
@@ -18,7 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
def
destroy
@email
=
current_user
.
emails
.
find
(
params
[
:id
])
@email
.
destroy
Emails
::
DestroyService
.
new
(
self
,
self
,
email:
@email
.
email
).
execute
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execute
{
|
user
|
user
.
update_secondary_emails!
}
...
...
app/models/user.rb
View file @
3bab585b
...
...
@@ -494,7 +494,7 @@ class User < ActiveRecord::Base
def
update_emails_with_primary_email
primary_email_record
=
emails
.
find_by
(
email:
email
)
if
primary_email_record
primary_email_record
.
destroy
Emails
::
DestroyService
.
new
(
self
,
self
,
email:
email
).
execute
emails
.
create
(
email:
email_was
)
update_secondary_emails!
...
...
app/services/emails/destroy_service.rb
View file @
3bab585b
...
...
@@ -3,7 +3,7 @@ module Emails
def
execute
(
skip_authorization:
false
)
raise
Gitlab
::
Access
::
AccessDeniedError
unless
skip_authorization
||
can_manage_emails?
Email
.
find_by_email
(
@email
).
destroy
!
Email
.
find_by_email
(
@email
).
destroy
end
end
end
lib/api/users.rb
View file @
3bab585b
...
...
@@ -276,7 +276,7 @@ module API
email
=
user
.
emails
.
find_by
(
id:
params
[
:email_id
])
not_found!
(
'Email'
)
unless
email
email
.
destroy
Emails
::
DestroyService
.
new
(
current_user
,
self
,
email:
email
.
email
).
execute
::
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
user
.
update_secondary_emails!
...
...
@@ -510,7 +510,8 @@ module API
email
=
current_user
.
emails
.
find_by
(
id:
params
[
:email_id
])
not_found!
(
'Email'
)
unless
email
email
.
destroy
Emails
::
DestroyService
.
new
(
current_user
,
self
,
email:
email
.
email
).
execute
::
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execute
do
|
user
|
user
.
update_secondary_emails!
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