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
831b2fcc
Commit
831b2fcc
authored
Jun 19, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update missing email actions
parent
87bf08c9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
emails_controller.rb
app/controllers/profiles/emails_controller.rb
+1
-1
user.rb
app/models/user.rb
+1
-1
create_service.rb
app/services/emails/create_service.rb
+1
-1
users.rb
lib/api/users.rb
+4
-6
No files found.
app/controllers/profiles/emails_controller.rb
View file @
831b2fcc
...
...
@@ -7,7 +7,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
def
create
@email
=
current_user
.
emails
.
new
(
email_params
)
if
@email
.
sav
e
if
Emails
::
CreateService
.
new
(
current_user
,
current_user
,
email_params
).
execut
e
NotificationService
.
new
.
new_email
(
@email
)
else
flash
[
:alert
]
=
@email
.
errors
.
full_messages
.
first
...
...
app/models/user.rb
View file @
831b2fcc
...
...
@@ -495,7 +495,7 @@ class User < ActiveRecord::Base
primary_email_record
=
emails
.
find_by
(
email:
email
)
if
primary_email_record
Emails
::
DestroyService
.
new
(
self
,
self
,
email:
email
).
execute
emails
.
create
(
email:
email_was
)
Emails
::
CreateService
.
new
(
self
,
self
,
email:
email_was
).
execute
update_secondary_emails!
end
...
...
app/services/emails/create_service.rb
View file @
831b2fcc
...
...
@@ -3,7 +3,7 @@ module Emails
def
execute
(
skip_authorization:
false
)
raise
Gitlab
::
Access
::
AccessDeniedError
unless
skip_authorization
||
can_manage_emails?
@user
.
emails
.
create
!
(
email:
@email
)
@user
.
emails
.
create
(
email:
@email
)
end
end
end
lib/api/users.rb
View file @
831b2fcc
...
...
@@ -98,7 +98,7 @@ module API
authenticated_as_admin!
params
=
declared_params
(
include_missing:
false
)
user
=
::
Users
::
CreateService
.
new
(
current_user
,
params
).
execute
user
=
::
Users
::
CreateService
.
new
(
current_user
,
params
).
execute
(
skip_authorization:
true
)
if
user
.
persisted?
present
user
,
with:
Entities
::
UserPublic
...
...
@@ -236,9 +236,7 @@ module API
user
=
User
.
find_by
(
id:
params
.
delete
(
:id
))
not_found!
(
'User'
)
unless
user
email
=
user
.
emails
.
new
(
declared_params
(
include_missing:
false
))
if
email
.
save
if
Emails
::
CreateService
.
new
(
current_user
,
user
,
declared_params
(
include_missing:
false
)).
execute
(
skip_authorization:
true
)
NotificationService
.
new
.
new_email
(
email
)
present
email
,
with:
Entities
::
Email
else
...
...
@@ -276,7 +274,7 @@ module API
email
=
user
.
emails
.
find_by
(
id:
params
[
:email_id
])
not_found!
(
'Email'
)
unless
email
Emails
::
DestroyService
.
new
(
current_user
,
user
,
email:
email
.
email
).
execute
Emails
::
DestroyService
.
new
(
current_user
,
user
,
email:
email
.
email
).
execute
(
skip_authorization:
true
)
::
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
user
.
update_secondary_emails!
...
...
@@ -494,7 +492,7 @@ module API
post
"emails"
do
email
=
current_user
.
emails
.
new
(
declared_params
)
if
email
.
sav
e
if
Emails
::
CreateService
.
new
(
current_user
,
current_user
,
declared_params
).
execut
e
NotificationService
.
new
.
new_email
(
email
)
present
email
,
with:
Entities
::
Email
else
...
...
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