summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-19 03:07:38 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-19 03:07:38 +0000
commit0cee6f1577cd31cae7dc0e82f65dcad462a4d18a (patch)
tree180a48cc0b5b15e6f2ac489a6c828ebab591d4cf /app/helpers
parentdcd01617a750c41fd082cc3383fc7ad2f2afd026 (diff)
downloadgitlab-ce-0cee6f1577cd31cae7dc0e82f65dcad462a4d18a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_settings_helper.rb1
-rw-r--r--app/helpers/learn_gitlab_helper.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 339938245a0..1b7657c0381 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -197,6 +197,7 @@ module ApplicationSettingsHelper
:allow_local_requests_from_hooks_and_services,
:allow_local_requests_from_web_hooks_and_services,
:allow_local_requests_from_system_hooks,
+ :allow_possible_spam,
:dns_rebinding_protection_enabled,
:archive_builds_in_human_readable,
:asset_proxy_enabled,
diff --git a/app/helpers/learn_gitlab_helper.rb b/app/helpers/learn_gitlab_helper.rb
index a07922e451a..e1241f8b572 100644
--- a/app/helpers/learn_gitlab_helper.rb
+++ b/app/helpers/learn_gitlab_helper.rb
@@ -36,7 +36,6 @@ module LearnGitlabHelper
{
url: url,
completed: attributes[Onboarding::Progress.column_name(action)].present?,
- svg: image_path("learn_gitlab/#{action}.svg"),
enabled: true
}
]