Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
752da8af
Commit
752da8af
authored
Oct 11, 2016
by
Borja Aparicio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Git access panel for Wikis when Kerberos authentication is enabled
parent
ab85ad6d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
CHANGELOG-EE
CHANGELOG-EE
+1
-0
app/models/project_wiki.rb
app/models/project_wiki.rb
+5
-0
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+8
-0
No files found.
CHANGELOG-EE
View file @
752da8af
...
...
@@ -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)
...
...
app/models/project_wiki.rb
View file @
752da8af
...
...
@@ -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
...
...
spec/models/project_wiki_spec.rb
View file @
752da8af
...
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment