Commit cfb06e5d authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Backticks in gitlab-init should be escaped

parent f3fec295
...@@ -28,7 +28,7 @@ if [ ! -z $HOST ] && [ ! -z $SSH_HOST ] && [ ! -z $EMAIL_FROM ] && [ ! -z $EMAIL ...@@ -28,7 +28,7 @@ if [ ! -z $HOST ] && [ ! -z $SSH_HOST ] && [ ! -z $EMAIL_FROM ] && [ ! -z $EMAIL
# 3. Update gitlab -> email_from # 3. Update gitlab -> email_from
# 4. If you installed Git from source, change git -> bin_path to /usr/local/bin/git # 4. If you installed Git from source, change git -> bin_path to /usr/local/bin/git
# IMPORTANT: If Git was installed in a different location use that instead. # IMPORTANT: If Git was installed in a different location use that instead.
# You can check with `which git`. If a wrong path of Git is specified, it will # You can check with \`which git\`. If a wrong path of Git is specified, it will
# result in various issues such as failures of GitLab CI builds. # result in various issues such as failures of GitLab CI builds.
# 5. Review this configuration file for other settings you may want to adjust # 5. Review this configuration file for other settings you may want to adjust
...@@ -49,7 +49,7 @@ production: &base ...@@ -49,7 +49,7 @@ production: &base
# Uncomment this line below if your ssh host is different from HTTP/HTTPS one # Uncomment this line below if your ssh host is different from HTTP/HTTPS one
# (you'd obviously need to replace ssh.host_example.com with your own host). # (you'd obviously need to replace ssh.host_example.com with your own host).
# Otherwise, ssh host will be set to the `host:` value above # Otherwise, ssh host will be set to the \`host:\` value above
ssh_host: $SSH_HOST ssh_host: $SSH_HOST
# Relative URL support # Relative URL support
...@@ -97,7 +97,7 @@ production: &base ...@@ -97,7 +97,7 @@ production: &base
## Date & Time settings ## Date & Time settings
# Uncomment and customize if you want to change the default time zone of GitLab application. # Uncomment and customize if you want to change the default time zone of GitLab application.
# To see all available zones, run `bundle exec rake time:zones:all RAILS_ENV=production` # To see all available zones, run \`bundle exec rake time:zones:all RAILS_ENV=production\`
# time_zone: 'UTC' # time_zone: 'UTC'
## Email settings ## Email settings
...@@ -181,8 +181,8 @@ production: &base ...@@ -181,8 +181,8 @@ production: &base
incoming_email: incoming_email:
enabled: false enabled: false
# The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to. # The email address including the \`%{key}\` placeholder that will be replaced to reference the item being replied to.
# The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the `@`). # The placeholder can be omitted but if present, it must appear in the "user" part of the address (before the \`@\`).
# Please be aware that a placeholder is required for the Service Desk feature to work. # Please be aware that a placeholder is required for the Service Desk feature to work.
address: "gitlab-incoming+%{key}@gmail.com" address: "gitlab-incoming+%{key}@gmail.com"
...@@ -207,7 +207,7 @@ production: &base ...@@ -207,7 +207,7 @@ production: &base
# The IDLE command timeout. # The IDLE command timeout.
idle_timeout: 60 idle_timeout: 60
# The log file path for the structured log file. # The log file path for the structured log file.
# Since `mail_room` is run independently of Rails, an absolute path is preferred. # Since \`mail_room\` is run independently of Rails, an absolute path is preferred.
# The default is 'log/mail_room_json.log' relative to the root of the Rails app. # The default is 'log/mail_room_json.log' relative to the root of the Rails app.
# #
# log_path: log/mail_room_json.log # log_path: log/mail_room_json.log
...@@ -760,19 +760,19 @@ production: &base ...@@ -760,19 +760,19 @@ production: &base
# LDAP attributes that GitLab will use to create an account for the LDAP user. # LDAP attributes that GitLab will use to create an account for the LDAP user.
# The specified attribute can either be the attribute name as a string (e.g. 'mail'), # The specified attribute can either be the attribute name as a string (e.g. 'mail'),
# or an array of attribute names to try in order (e.g. ['mail', 'email']). # or an array of attribute names to try in order (e.g. ['mail', 'email']).
# Note that the user's LDAP login will always be the attribute specified as `uid` above. # Note that the user's LDAP login will always be the attribute specified as \`uid\` above.
attributes: attributes:
# The username will be used in paths for the user's own projects # The username will be used in paths for the user's own projects
# (like `gitlab.example.com/username/project`) and when mentioning # (like \`gitlab.example.com/username/project\`) and when mentioning
# them in issues, merge request and comments (like `@username`). # them in issues, merge request and comments (like \`@username\`).
# If the attribute specified for `username` contains an email address, # If the attribute specified for \`username\` contains an email address,
# the GitLab username will be the part of the email address before the '@'. # the GitLab username will be the part of the email address before the '@'.
username: ['uid', 'userid', 'sAMAccountName'] username: ['uid', 'userid', 'sAMAccountName']
email: ['mail', 'email', 'userPrincipalName'] email: ['mail', 'email', 'userPrincipalName']
# If no full name could be found at the attribute specified for `name`, # If no full name could be found at the attribute specified for \`name\`,
# the full name is determined using the attributes specified for # the full name is determined using the attributes specified for
# `first_name` and `last_name`. # \`first_name\` and \`last_name\`.
name: 'cn' name: 'cn'
first_name: 'givenName' first_name: 'givenName'
last_name: 'sn' last_name: 'sn'
...@@ -870,7 +870,7 @@ production: &base ...@@ -870,7 +870,7 @@ production: &base
# Set different Omniauth providers as external so that all users creating accounts # Set different Omniauth providers as external so that all users creating accounts
# via these providers will not be able to have access to internal projects. You # via these providers will not be able to have access to internal projects. You
# will need to use the full name of the provider, like `google_oauth2` for Google. # will need to use the full name of the provider, like \`google_oauth2\` for Google.
# Refer to the examples below for the full names of the supported providers. # Refer to the examples below for the full names of the supported providers.
# (default: []) # (default: [])
external_providers: [] external_providers: []
...@@ -997,7 +997,7 @@ production: &base ...@@ -997,7 +997,7 @@ production: &base
# IMPORTANT: None of the path components may be symlink, because # IMPORTANT: None of the path components may be symlink, because
# gitlab-shell invokes Dir.pwd inside the repository path and that results # gitlab-shell invokes Dir.pwd inside the repository path and that results
# real path not the symlink. # real path not the symlink.
storages: # You must have at least a `default` storage path. storages: # You must have at least a \`default\` storage path.
default: default:
path: /var/lib/gitlab/repositories/ path: /var/lib/gitlab/repositories/
gitaly_address: unix:/run/gitlab/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). gitaly_address: unix:/run/gitlab/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
...@@ -1109,7 +1109,7 @@ production: &base ...@@ -1109,7 +1109,7 @@ production: &base
# port: 8082 # port: 8082
# Web exporter is webserver built in to Unicorn/Puma to expose Prometheus metrics # Web exporter is webserver built in to Unicorn/Puma to expose Prometheus metrics
# It runs alongside the `/metrics` endpoints to ease the publish of metrics # It runs alongside the \`/metrics\` endpoints to ease the publish of metrics
web_exporter: web_exporter:
# enabled: true # enabled: true
# address: localhost # address: localhost
...@@ -1186,8 +1186,8 @@ test: ...@@ -1186,8 +1186,8 @@ test:
enabled: true enabled: true
external_diffs: external_diffs:
enabled: false enabled: false
# Diffs may be `always` external (the default), or they can be made external # Diffs may be \`always\` external (the default), or they can be made external
# after they have become `outdated` (i.e., the MR is closed or a new version # after they have become \`outdated\` (i.e., the MR is closed or a new version
# has been pushed). # has been pushed).
# when: always # when: always
# The location where external diffs are stored (default: shared/external-diffs). # The location where external diffs are stored (default: shared/external-diffs).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment