From 1219a9dce91f4edbc135dfc08299b4122b4825a8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 Apr 2020 15:07:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/members/update_highest_role_service.rb | 5 +++-- app/services/snippets/update_service.rb | 2 +- app/services/users/update_highest_member_role_service.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'app/services') diff --git a/app/services/members/update_highest_role_service.rb b/app/services/members/update_highest_role_service.rb index ce1707c13ec..5ebd2e03df1 100644 --- a/app/services/members/update_highest_role_service.rb +++ b/app/services/members/update_highest_role_service.rb @@ -4,7 +4,8 @@ module Members class UpdateHighestRoleService < ::BaseService include ExclusiveLeaseGuard - LEASE_TIMEOUT = 30.minutes.to_i + LEASE_TIMEOUT = 10.minutes.to_i + DELAY = 10.minutes attr_reader :user_id @@ -14,7 +15,7 @@ module Members def execute try_obtain_lease do - UpdateHighestRoleWorker.perform_async(user_id) + UpdateHighestRoleWorker.perform_in(DELAY, user_id) end end diff --git a/app/services/snippets/update_service.rb b/app/services/snippets/update_service.rb index 76ce8231410..5794332a45b 100644 --- a/app/services/snippets/update_service.rb +++ b/app/services/snippets/update_service.rb @@ -52,7 +52,7 @@ module Snippets create_commit(snippet) if snippet.repository_exists? end rescue => e - snippet.errors.add(:repository, 'Error updating the snippet') + snippet.errors.add(:repository, e.message) log_error(e.message) false diff --git a/app/services/users/update_highest_member_role_service.rb b/app/services/users/update_highest_member_role_service.rb index 00f0af89e8d..90a5966265d 100644 --- a/app/services/users/update_highest_member_role_service.rb +++ b/app/services/users/update_highest_member_role_service.rb @@ -2,7 +2,7 @@ module Users class UpdateHighestMemberRoleService < BaseService - attr_reader :user, :identity_params + attr_reader :user def initialize(user) @user = user -- cgit v1.2.1