diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 15:10:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 15:10:37 +0300 |
| commit | a4db97517ad095914c0652a07486ac607d99dab4 (patch) | |
| tree | 58f57b42c52b1b4231cab44ef3934cbe55991d25 /lib | |
| parent | 17295c75a1a28df78f719e0098dd31fe45ce0446 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers.rb | 3 | ||||
| -rw-r--r-- | lib/integrations/google_cloud_platform/base_client.rb | 2 | ||||
| -rw-r--r-- | lib/sidebars/organizations/menus/scope_menu.rb | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index f5dcbc07704..6cb9d19a2ad 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -184,8 +184,7 @@ module API return true unless job_token_authentication? return true unless route_authentication_setting[:job_token_scope] == :project - ::Feature.enabled?(:ci_job_token_scope, project) && - current_authenticated_job.project == project + current_authenticated_job.project == project end # rubocop: disable CodeReuse/ActiveRecord diff --git a/lib/integrations/google_cloud_platform/base_client.rb b/lib/integrations/google_cloud_platform/base_client.rb index 56c05e7987b..937454cda43 100644 --- a/lib/integrations/google_cloud_platform/base_client.rb +++ b/lib/integrations/google_cloud_platform/base_client.rb @@ -6,7 +6,7 @@ module Integrations GLGO_BASE_URL = if Gitlab.staging? 'https://glgo.staging.runway.gitlab.net' else - 'http://glgo.runway.gitlab.net/' + 'https://glgo.runway.gitlab.net' end def initialize(project:, user:) diff --git a/lib/sidebars/organizations/menus/scope_menu.rb b/lib/sidebars/organizations/menus/scope_menu.rb index a535be21280..559e57bc171 100644 --- a/lib/sidebars/organizations/menus/scope_menu.rb +++ b/lib/sidebars/organizations/menus/scope_menu.rb @@ -27,7 +27,7 @@ module Sidebars override :serialize_as_menu_item_args def serialize_as_menu_item_args super.merge({ - avatar: nil, + avatar: context.container.avatar_url(size: 48), entity_id: context.container.id, super_sidebar_parent: ::Sidebars::StaticMenu, item_id: :organization_overview |