diff --git a/README.md b/README.md index cb3f9230daa1156b04e6c921c5e21ccc50a492bc..690e1b17bc8e215293ee1c7126f674056d6387e7 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). diff --git a/app/controllers/hello_controller.rb b/app/controllers/hello_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..007db97bc0c172e421ec2998d2f70b09735539be --- /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 151c7fa1c1b45791d964abbbb82e78d2f05535a5..2879f84bea97b2c51edf603412fa5de4034b6536 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 diff --git a/ee/app/models/concerns/ai/user_authorizable.rb b/ee/app/models/concerns/ai/user_authorizable.rb index 2d976c5ab0a8797dfdd223b9392e8713fd9946bb..043953cef900e38a08c90d8e592ffcc6a2d2fc14 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