Skip to content
Snippets Groups Projects
Commit 752da8af authored by Borja Aparicio's avatar Borja Aparicio
Browse files

Fix Git access panel for Wikis when Kerberos authentication is enabled

parent ab85ad6d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
- Fix 500 error updating mirror URLs for projects
- Fix validations related to mirroring settings form. !773
- Fix Git access panel for Wikis when Kerberos authentication is enabled (Borja Aparicio)
 
v 8.12.5 (unreleased)
 
Loading
Loading
Loading
Loading
@@ -45,6 +45,11 @@ class ProjectWiki
[Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('')
end
 
# No need to have a Kerberos Web url. Kerberos URL will be used only to clone
def kerberos_url_to_repo
[Gitlab.config.build_gitlab_kerberos_url, "/", path_with_namespace, ".git"].join('')
end
def wiki_base_path
[Gitlab.config.gitlab.relative_url_root, "/", @project.path_with_namespace, "/wikis"].join('')
end
Loading
Loading
Loading
Loading
@@ -42,6 +42,14 @@ describe ProjectWiki, models: true do
end
end
 
describe "#kerberos_url_to_repo" do
it 'returns valid kerberos url for this repo' do
gitlab_kerberos_url = Gitlab.config.build_gitlab_kerberos_url
repo_kerberos_url = "#{gitlab_kerberos_url}/#{subject.path_with_namespace}.git"
expect(subject.kerberos_url_to_repo).to eq(repo_kerberos_url)
end
end
describe "#wiki_base_path" do
it "returns the wiki base path" do
wiki_base_path = "#{Gitlab.config.gitlab.relative_url_root}/#{project.path_with_namespace}/wikis"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment