diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 12:08:18 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 12:08:18 +0000 |
commit | 684d65316ac77c62f47d68b9926eea8af30db227 (patch) | |
tree | d1f4c4eec399d7772ab4ad6294f98e7505c1cee5 /app/services | |
parent | ade18c9d68d5a2e6c6e28ef7e9d3add3b3491ace (diff) | |
download | gitlab-ce-684d65316ac77c62f47d68b9926eea8af30db227.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
4 files changed, 32 insertions, 6 deletions
diff --git a/app/services/concerns/deploy_token_methods.rb b/app/services/concerns/deploy_token_methods.rb index c0208b16623..c875342a07c 100644 --- a/app/services/concerns/deploy_token_methods.rb +++ b/app/services/concerns/deploy_token_methods.rb @@ -8,4 +8,10 @@ module DeployTokenMethods deploy_token.username = params[:username].presence end end + + def destroy_deploy_token(entity, params) + deploy_token = entity.deploy_tokens.find_by_id!(params[:token_id]) + + deploy_token.destroy + end end diff --git a/app/services/groups/deploy_tokens/destroy_service.rb b/app/services/groups/deploy_tokens/destroy_service.rb new file mode 100644 index 00000000000..6dae22f29d2 --- /dev/null +++ b/app/services/groups/deploy_tokens/destroy_service.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Groups + module DeployTokens + class DestroyService < BaseService + include DeployTokenMethods + + def execute + destroy_deploy_token(@group, params) + end + end + end +end diff --git a/app/services/projects/deploy_tokens/destroy_service.rb b/app/services/projects/deploy_tokens/destroy_service.rb new file mode 100644 index 00000000000..e063f86a65c --- /dev/null +++ b/app/services/projects/deploy_tokens/destroy_service.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Projects + module DeployTokens + class DestroyService < BaseService + include DeployTokenMethods + + def execute + destroy_deploy_token(@project, params) + end + end + end +end diff --git a/app/services/resource_events/synthetic_milestone_notes_builder_service.rb b/app/services/resource_events/synthetic_milestone_notes_builder_service.rb index ad58417834e..cc6383d7083 100644 --- a/app/services/resource_events/synthetic_milestone_notes_builder_service.rb +++ b/app/services/resource_events/synthetic_milestone_notes_builder_service.rb @@ -10,8 +10,6 @@ module ResourceEvents private def synthetic_notes - return [] unless tracking_enabled? - milestone_change_events.map do |event| MilestoneNote.from_event(event, resource: resource, resource_parent: resource_parent) end @@ -23,9 +21,5 @@ module ResourceEvents events = resource.resource_milestone_events.includes(user: :status) # rubocop: disable CodeReuse/ActiveRecord since_fetch_at(events) end - - def tracking_enabled? - ::Feature.enabled?(:track_resource_milestone_change_events, resource.project) - end end end |