diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 21:07:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 21:07:51 +0300 |
| commit | cea01cb81787f0d2c119b287a5833f2e267324bc (patch) | |
| tree | ca37d57c1ec57ef2fa475e6489c4c107cce89dbc /app/helpers | |
| parent | ee24c7d68f57a67754a5d1e2ea99f688029d14bd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/ci/runners_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/issues_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/users/callouts_helper.rb | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb index ac36c867baf..41ef0bd20a8 100644 --- a/app/helpers/ci/runners_helper.rb +++ b/app/helpers/ci/runners_helper.rb @@ -63,6 +63,7 @@ module Ci # Runner install help page is external, located at # https://gitlab.com/gitlab-org/gitlab-runner runner_install_help_page: 'https://docs.gitlab.com/runner/install/', + new_runner_path: new_admin_runner_path, registration_token: Gitlab::CurrentSettings.runners_registration_token, online_contact_timeout_secs: ::Ci::Runner::ONLINE_CONTACT_TIMEOUT.to_i, stale_timeout_secs: ::Ci::Runner::STALE_TIMEOUT.to_i, diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 362f1e65425..114bcda127f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -195,7 +195,6 @@ module IssuesHelper empty_state_svg_path: image_path('illustrations/issues.svg'), full_path: namespace.full_path, initial_sort: current_user&.user_preference&.issues_sort, - is_anonymous_search_disabled: Feature.enabled?(:disable_anonymous_search, type: :ops).to_s, is_issue_repositioning_disabled: issue_repositioning_disabled?.to_s, is_public_visibility_restricted: Gitlab::CurrentSettings.restricted_visibility_levels&.include?(Gitlab::VisibilityLevel::PUBLIC).to_s, diff --git a/app/helpers/users/callouts_helper.rb b/app/helpers/users/callouts_helper.rb index 6ab78b58457..2b8368dd29f 100644 --- a/app/helpers/users/callouts_helper.rb +++ b/app/helpers/users/callouts_helper.rb @@ -25,10 +25,6 @@ module Users !user_dismissed?(GCP_SIGNUP_OFFER) end - def render_flash_user_callout(flash_type, message, feature_name) - render 'shared/flash_user_callout', flash_type: flash_type, message: message, feature_name: feature_name - end - def render_dashboard_ultimate_trial(user) end |