Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
3 files
+ 9
8
Compare changes
  • Side-by-side
  • Inline
Files
3
+ 22
6
@@ -20,11 +20,11 @@ production: &base
@@ -20,11 +20,11 @@ production: &base
https: false
https: false
# Uncomment and customize the last line to run in a non-root path
# Uncomment and customize the last line to run in a non-root path
# WARNING: This feature is no longer supported
# WARNING: This feature is known to work, but unsupported
# Note that three settings need to be changed for this to work.
# Note that three settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: relative_url_root: /gitlab
# 2) In your gitlab.yml file: relative_url_root: /gitlab
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
#
#
# relative_url_root: /gitlab
# relative_url_root: /gitlab
@@ -42,14 +42,24 @@ production: &base
@@ -42,14 +42,24 @@ production: &base
default_projects_limit: 10
default_projects_limit: 10
# default_can_create_group: false # default: true
# default_can_create_group: false # default: true
# username_changing_enabled: false # default: true - User can change her username/namespace
# username_changing_enabled: false # default: true - User can change her username/namespace
 
## Default theme
 
## BASIC = 1
 
## MARS = 2
 
## MODERN = 3
 
## GRAY = 4
 
## COLOR = 5
 
# default_theme: 2 # default: 2
 
## Users management
## Users management
# signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled.
# default: false - Account passwords are not sent via the email if signup is enabled.
 
# signup_enabled: true
## Automatic issue closing
## Automatic issue closing
# If a commit message matches this regular express, all issues referenced from the matched text will be closed
# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
# if it's pushed to a project's default branch.
# This happends when the commit is pushed or merged into the default branch of a project.
# issue_closing_pattern: "^([Cc]loses|[Ff]ixes) +#\d+"
# When not specified the default issue_closing_pattern as specified below will be used.
 
# issue_closing_pattern: ([Cc]loses|[Ff]ixes) +#\d+
## Default project features settings
## Default project features settings
default_projects_features:
default_projects_features:
@@ -58,6 +68,12 @@ production: &base
@@ -58,6 +68,12 @@ production: &base
wiki: true
wiki: true
wall: false
wall: false
snippets: false
snippets: false
 
public: false
 
 
## Webhook settings
 
# Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
 
# webhook_timeout: 10
 
## External issues trackers
## External issues trackers
issues_tracker:
issues_tracker:
Loading