diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 09:09:43 +0000 |
commit | f5050253469fc0961c02deec0e698ad62bdd9de5 (patch) | |
tree | 30bbd8f8b556fd5b730f0123921138ee1d6bdaa2 /lib | |
parent | f6cdec670b9b757fc2225a2c6627ab79765e5b8a (diff) | |
download | gitlab-ce-f5050253469fc0961c02deec0e698ad62bdd9de5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/helpers/internal_helpers.rb | 2 | ||||
-rw-r--r-- | lib/api/internal/pages.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index 003ed229385..f7aabc8ce4f 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -110,7 +110,7 @@ module API return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action) { - repository: repository.gitaly_repository.to_h, + repository: repository.gitaly_repository, address: Gitlab::GitalyClient.address(container.repository_storage), token: Gitlab::GitalyClient.token(container.repository_storage), features: Feature::Gitaly.server_feature_flags diff --git a/lib/api/internal/pages.rb b/lib/api/internal/pages.rb index f19dbe563ac..6c8da414e4d 100644 --- a/lib/api/internal/pages.rb +++ b/lib/api/internal/pages.rb @@ -16,6 +16,13 @@ module API namespace 'internal' do namespace 'pages' do + desc 'Indicates that pages API is enabled and auth token is valid' do + detail 'This feature was introduced in GitLab 12.10.' + end + get "status" do + no_content! + end + desc 'Get GitLab Pages domain configuration by hostname' do detail 'This feature was introduced in GitLab 12.3.' end |