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
db04a18d
Commit
db04a18d
authored
Jul 09, 2019
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE-EE parity for shared config files
This copies over EE-specific changes to shared configuration files in CE.
parent
6d3fede0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
1 deletion
+30
-1
config/gitlab.yml.example
config/gitlab.yml.example
+3
-0
config/initializers/ar_speed_up_migration_checking.rb
config/initializers/ar_speed_up_migration_checking.rb
+2
-1
config/settings.rb
config/settings.rb
+25
-0
No files found.
config/gitlab.yml.example
View file @
db04a18d
...
...
@@ -664,6 +664,9 @@ production: &base
# Port where the client side certificate is requested by the webserver (NGINX/Apache)
# client_certificate_required_port: 3444
# Browser session with smartcard sign-in is required for Git access
# required_for_git_access: false
## Kerberos settings
kerberos:
# Allow the HTTP Negotiate authentication method for Git clients
...
...
config/initializers/ar_speed_up_migration_checking.rb
View file @
db04a18d
...
...
@@ -10,7 +10,8 @@ if Rails.env.test?
# it reads + parses `db/migrate/*` each time. Memoizing it can save 0.5
# seconds per spec.
def
migrations
(
paths
)
(
@migrations
||=
migrations_unmemoized
(
paths
)).
dup
@migrations
||=
{}
(
@migrations
[
paths
]
||=
migrations_unmemoized
(
paths
)).
dup
end
end
end
...
...
config/settings.rb
View file @
db04a18d
...
...
@@ -62,6 +62,31 @@ class Settings < Settingslogic
(
base_url
(
gitlab
)
+
[
gitlab
.
relative_url_root
]).
join
(
''
)
end
def
kerberos_protocol
kerberos
.
https
?
"https"
:
"http"
end
def
kerberos_port
kerberos
.
use_dedicated_port
?
kerberos
.
port
:
gitlab
.
port
end
# Curl expects username/password for authentication. However when using GSS-Negotiate not credentials should be needed.
# By inserting in the Kerberos dedicated URL ":@", we give to curl an empty username and password and GSS auth goes ahead
# Known bug reported in http://sourceforge.net/p/curl/bugs/440/ and http://curl.haxx.se/docs/knownbugs.html
def
build_gitlab_kerberos_url
[
kerberos_protocol
,
"://:@"
,
gitlab
.
host
,
":
#{
kerberos_port
}
"
,
gitlab
.
relative_url_root
].
join
(
''
)
end
def
alternative_gitlab_kerberos_url?
kerberos
.
enabled
&&
(
build_gitlab_kerberos_url
!=
build_gitlab_url
)
end
# check that values in `current` (string or integer) is a contant in `modul`.
def
verify_constant_array
(
modul
,
current
,
default
)
values
=
default
||
[]
...
...
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