summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
Diffstat (limited to 'app/services')
-rw-r--r--app/services/users/build_service.rb1
-rw-r--r--app/services/users/create_service.rb1
-rw-r--r--app/services/users/update_service.rb5
3 files changed, 2 insertions, 5 deletions
diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb
index 363135ef09b..ff234a3440f 100644
--- a/app/services/users/build_service.rb
+++ b/app/services/users/build_service.rb
@@ -1,5 +1,4 @@
module Users
- # Service for building a new user.
class BuildService < BaseService
def initialize(current_user, params = {})
@current_user = current_user
diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb
index e22f7225ae2..74abc017cea 100644
--- a/app/services/users/create_service.rb
+++ b/app/services/users/create_service.rb
@@ -1,5 +1,4 @@
module Users
- # Service for creating a new user.
class CreateService < BaseService
def initialize(current_user, params = {})
@current_user = current_user
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 2037664f56a..dfbd6016c3f 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -1,5 +1,4 @@
module Users
- # Service for updating a user.
class UpdateService < BaseService
def initialize(user, params = {})
@user = user
@@ -7,6 +6,8 @@ module Users
end
def execute(validate: true, &block)
+ yield(@user) if block_given?
+
assign_attributes(&block)
if @user.save(validate: validate)
@@ -27,8 +28,6 @@ module Users
private
def assign_attributes(&block)
- yield(@user) if block_given?
-
@user.assign_attributes(params) if params.any?
end
end