diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 15:09:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 15:09:52 +0300 |
| commit | 546ddc3f6ac96fdf09934390a938bb391d07dc94 (patch) | |
| tree | d0c92fca27ee76b5a20b7bfb56bda6f057424127 /app/services | |
| parent | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/audit_event_service.rb | 10 | ||||
| -rw-r--r-- | app/services/groups/deploy_tokens/create_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/deploy_tokens/create_service.rb | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb index 42ed5f17d8d..d9e40c456aa 100644 --- a/app/services/audit_event_service.rb +++ b/app/services/audit_event_service.rb @@ -13,7 +13,7 @@ class AuditEventService # # @return [AuditEventService] def initialize(author, entity, details = {}) - @author = author + @author = build_author(author) @entity = entity @details = details end @@ -49,6 +49,14 @@ class AuditEventService private + def build_author(author) + if author.is_a?(User) + author + else + Gitlab::Audit::UnauthenticatedAuthor.new(name: author) + end + end + def base_payload { author_id: @author.id, diff --git a/app/services/groups/deploy_tokens/create_service.rb b/app/services/groups/deploy_tokens/create_service.rb index d747dabcd3c..81f761eb61d 100644 --- a/app/services/groups/deploy_tokens/create_service.rb +++ b/app/services/groups/deploy_tokens/create_service.rb @@ -9,7 +9,7 @@ module Groups deploy_token = create_deploy_token_for(@group, params) if deploy_token.persisted? - success(deploy_token: deploy_token, http_status: :ok) + success(deploy_token: deploy_token, http_status: :created) else error(deploy_token.errors.full_messages.to_sentence, :bad_request) end diff --git a/app/services/projects/deploy_tokens/create_service.rb b/app/services/projects/deploy_tokens/create_service.rb index e943b2489ac..2e71650b066 100644 --- a/app/services/projects/deploy_tokens/create_service.rb +++ b/app/services/projects/deploy_tokens/create_service.rb @@ -9,7 +9,7 @@ module Projects deploy_token = create_deploy_token_for(@project, params) if deploy_token.persisted? - success(deploy_token: deploy_token, http_status: :ok) + success(deploy_token: deploy_token, http_status: :created) else error(deploy_token.errors.full_messages.to_sentence, :bad_request) end |