From 51ef03bc5f63b0ad183e264e9c13d5d92ba3e92e Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Wed, 17 Sep 2025 17:02:17 +0200 Subject: [PATCH 1/3] Change README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cb3f9230daa115..690e1b17bc8e21 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # GitLab +BRANCH + ## Canonical source The canonical source of GitLab where all development takes place is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab). -- GitLab From 7185678433b87470334ade72e6094c4c3c9c8e78 Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Wed, 17 Sep 2025 17:05:53 +0200 Subject: [PATCH 2/3] Change some code --- ee/app/models/concerns/ai/user_authorizable.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/app/models/concerns/ai/user_authorizable.rb b/ee/app/models/concerns/ai/user_authorizable.rb index 2d976c5ab0a879..043953cef900e3 100644 --- a/ee/app/models/concerns/ai/user_authorizable.rb +++ b/ee/app/models/concerns/ai/user_authorizable.rb @@ -92,6 +92,7 @@ def billable_gitlab_duo_pro_root_group_ids # rubocop: enable Database/AvoidUsingPluckWithoutLimit -- limited to a single user's groups def any_group_with_ai_available? + puts "change" Rails.cache.fetch( ['users', id, GROUP_WITH_AI_ENABLED_CACHE_KEY], expires_in: GROUP_WITH_AI_ENABLED_CACHE_PERIOD -- GitLab From dde573b86653e0ec4e89229d326e62ef9f4ce9c8 Mon Sep 17 00:00:00 2001 From: Matthias Kaeppler Date: Thu, 18 Sep 2025 13:55:33 +0200 Subject: [PATCH 3/3] Add fake testing endpoint --- app/controllers/hello_controller.rb | 11 +++++++++++ config/routes.rb | 1 + 2 files changed, 12 insertions(+) create mode 100644 app/controllers/hello_controller.rb diff --git a/app/controllers/hello_controller.rb b/app/controllers/hello_controller.rb new file mode 100644 index 00000000000000..007db97bc0c172 --- /dev/null +++ b/app/controllers/hello_controller.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +# rubocop: disable Gitlab/NamespacedClass -- testing +# rubocop: disable Rails/ApplicationController -- testing +class HelloController < ActionController::Base + def hello + render plain: 'Hello there' + end +end +# rubocop: enable Gitlab/NamespacedClass +# rubocop: enable Rails/ApplicationController diff --git a/config/routes.rb b/config/routes.rb index 151c7fa1c1b457..2879f84bea97b2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -45,6 +45,7 @@ end # Add OPTIONS method for CORS preflight requests + get '/hello' => 'hello#hello' match '/oauth/userinfo' => 'doorkeeper/openid_connect/userinfo#show', via: :options match '/oauth/discovery/keys' => 'jwks#keys', via: :options match '/.well-known/openid-configuration' => 'jwks#provider', via: :options -- GitLab