diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-30 11:53:48 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-30 11:53:48 +0000 |
| commit | c7403521a8d3f0410a2929784339334af4c74059 (patch) | |
| tree | 572780c719f986d0ff270c68c9ba6bc563519dfe /app | |
| parent | 5920b4a52f7458172610e29150f84f13a617e37f (diff) | |
| parent | 53ef1de4fcdc7ea0f94ae8fe73f9a2b46e376223 (diff) | |
| download | gitlab-ce-c7403521a8d3f0410a2929784339334af4c74059.tar.gz | |
Merge branch '30248-fix-production-admin-fixture' into 'master'
Fix production admin fixture to use the new `Users::CreateService`
Closes #30248
See merge request !10326
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/users/create_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb index f4f0b80f30a..193fcd85896 100644 --- a/app/services/users/create_service.rb +++ b/app/services/users/create_service.rb @@ -94,7 +94,7 @@ module Users def build_user_params if current_user&.is_admin? user_params = params.slice(*admin_create_params) - user_params[:created_by_id] = current_user.id + user_params[:created_by_id] = current_user&.id if params[:reset_password] user_params.merge!(force_random_password: true, password_expires_at: nil) |