diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 03:07:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 03:07:42 +0000 |
commit | c3bcd285f88d6444a043c0c4f653e3749ec60d75 (patch) | |
tree | 22a0d4099002226326ff5700ca9e50bd97e8dd86 /app | |
parent | 427c549b6396885fb60a687326b6cd62878e4ca3 (diff) | |
download | gitlab-ce-c3bcd285f88d6444a043c0c4f653e3749ec60d75.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/concerns/spammable_actions.rb | 2 | ||||
-rw-r--r-- | app/graphql/mutations/snippets/mark_as_spam.rb | 2 | ||||
-rw-r--r-- | app/models/user.rb | 4 | ||||
-rw-r--r-- | app/services/concerns/spam_check_methods.rb | 2 | ||||
-rw-r--r-- | app/services/spam_service.rb | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/concerns/spammable_actions.rb b/app/controllers/concerns/spammable_actions.rb index a8ffa33f1c7..36fdbfd6eff 100644 --- a/app/controllers/concerns/spammable_actions.rb +++ b/app/controllers/concerns/spammable_actions.rb @@ -11,7 +11,7 @@ module SpammableActions end def mark_as_spam - if SpamService.new(spammable).mark_as_spam! + if SpamService.new(spammable: spammable).mark_as_spam! redirect_to spammable_path, notice: _("%{spammable_titlecase} was submitted to Akismet successfully.") % { spammable_titlecase: spammable.spammable_entity_type.titlecase } else redirect_to spammable_path, alert: _('Error with Akismet. Please check the logs for more info.') diff --git a/app/graphql/mutations/snippets/mark_as_spam.rb b/app/graphql/mutations/snippets/mark_as_spam.rb index 260a9753f76..96cb208651f 100644 --- a/app/graphql/mutations/snippets/mark_as_spam.rb +++ b/app/graphql/mutations/snippets/mark_as_spam.rb @@ -24,7 +24,7 @@ module Mutations private def mark_as_spam(snippet) - SpamService.new(snippet).mark_as_spam! + SpamService.new(spammable: snippet).mark_as_spam! end def authorized_resource?(snippet) diff --git a/app/models/user.rb b/app/models/user.rb index 47c5b3e208a..b9efbcdf502 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -286,6 +286,10 @@ class User < ApplicationRecord end end + before_transition do + !Gitlab::Database.read_only? + end + # rubocop: disable CodeReuse/ServiceClass # Ideally we should not call a service object here but user.block # is also bcalled by Users::MigrateToGhostUserService which references diff --git a/app/services/concerns/spam_check_methods.rb b/app/services/concerns/spam_check_methods.rb index a0945857f89..75d9759f1d1 100644 --- a/app/services/concerns/spam_check_methods.rb +++ b/app/services/concerns/spam_check_methods.rb @@ -24,7 +24,7 @@ module SpamCheckMethods # rubocop:disable Gitlab/ModuleWithInstanceVariables # rubocop: disable CodeReuse/ActiveRecord def spam_check(spammable, user) - spam_service = SpamService.new(spammable, @request) + spam_service = SpamService.new(spammable: spammable, request: @request) spam_service.when_recaptcha_verified(@recaptcha_verified, @api) do user.spam_logs.find_by(id: @spam_log_id)&.update!(recaptcha_verified: true) diff --git a/app/services/spam_service.rb b/app/services/spam_service.rb index 62ba8d8872e..a546c834603 100644 --- a/app/services/spam_service.rb +++ b/app/services/spam_service.rb @@ -4,7 +4,7 @@ class SpamService attr_accessor :spammable, :request, :options attr_reader :spam_log - def initialize(spammable, request = nil) + def initialize(spammable:, request: nil) @spammable = spammable @request = request @options = {} |