summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-31 10:50:10 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-31 10:50:10 +0200
commit8f1274ae0350590a8a0d8f16558d24a9514b78c1 (patch)
tree514a6628a0a45dac10608b408cf3f011c893431b /app/workers
parent79a7f7b6e59fa1225c440547796331caedabeaab (diff)
parent9a3b283402b8cc1c86802c526f19a459ce09c2e3 (diff)
downloadgitlab-ce-8f1274ae0350590a8a0d8f16558d24a9514b78c1.tar.gz
Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into backstage/gb/migrate-stages-statuses
* commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3': (270 commits) Add a note about EFS and GitLab log files Projects logo are not centered vertically on projects page Fix spec/features/projects/branches_spec Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id Fix a spec that was assuming to be on the wrong page Add copy about search terms to ux guide Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation' Fix replying to commit comments on MRs from forks Fix 500 error when rendering avatar for deleted project creator Load and process at most 100 commits when pushing into default branch Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Add log messages to clarify log messages about API CSRF token verification failure Update gitlab_flow.md, Teatro seems to be completely dead, see also https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774 Fix diff commenting results just after changing view Update CHANGELOG.md for 9.4.2 none is not a CSS Value for sizes ;-) Merge issuable "reopened" state into "opened" Make access level more compatible with EE Add link to JIRA article in docs Expand pipeline_trigger_service_spec by godfat request ...
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/create_gpg_signature_worker.rb16
-rw-r--r--app/workers/invalid_gpg_signature_update_worker.rb12
-rw-r--r--app/workers/project_destroy_worker.rb9
3 files changed, 31 insertions, 6 deletions
diff --git a/app/workers/create_gpg_signature_worker.rb b/app/workers/create_gpg_signature_worker.rb
new file mode 100644
index 00000000000..4f47717ff69
--- /dev/null
+++ b/app/workers/create_gpg_signature_worker.rb
@@ -0,0 +1,16 @@
+class CreateGpgSignatureWorker
+ include Sidekiq::Worker
+ include DedicatedSidekiqQueue
+
+ def perform(commit_sha, project_id)
+ project = Project.find_by(id: project_id)
+
+ return unless project
+
+ commit = project.commit(commit_sha)
+
+ return unless commit
+
+ commit.signature
+ end
+end
diff --git a/app/workers/invalid_gpg_signature_update_worker.rb b/app/workers/invalid_gpg_signature_update_worker.rb
new file mode 100644
index 00000000000..db6b1ea8e8d
--- /dev/null
+++ b/app/workers/invalid_gpg_signature_update_worker.rb
@@ -0,0 +1,12 @@
+class InvalidGpgSignatureUpdateWorker
+ include Sidekiq::Worker
+ include DedicatedSidekiqQueue
+
+ def perform(gpg_key_id)
+ gpg_key = GpgKey.find_by(id: gpg_key_id)
+
+ return unless gpg_key
+
+ Gitlab::Gpg::InvalidGpgSignatureUpdater.new(gpg_key).run
+ end
+end
diff --git a/app/workers/project_destroy_worker.rb b/app/workers/project_destroy_worker.rb
index b462327490e..a9188b78460 100644
--- a/app/workers/project_destroy_worker.rb
+++ b/app/workers/project_destroy_worker.rb
@@ -3,14 +3,11 @@ class ProjectDestroyWorker
include DedicatedSidekiqQueue
def perform(project_id, user_id, params)
- begin
- project = Project.unscoped.find(project_id)
- rescue ActiveRecord::RecordNotFound
- return
- end
-
+ project = Project.find(project_id)
user = User.find(user_id)
::Projects::DestroyService.new(project, user, params.symbolize_keys).execute
+ rescue ActiveRecord::RecordNotFound => error
+ logger.error("Failed to delete project (#{project_id}): #{error.message}")
end
end