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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
81a70bf5
Commit
81a70bf5
authored
10 years ago
by
Wes Gurney
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding ability to configure webhook timeout via gitlab.yml
parent
cbb44b9d
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
CHANGELOG
CHANGELOG
+1
-0
app/models/web_hook.rb
app/models/web_hook.rb
+1
-1
config/gitlab.yml.example
config/gitlab.yml.example
+6
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-0
No files found.
CHANGELOG
View file @
81a70bf5
...
...
@@ -27,6 +27,7 @@ v 7.3.0
- Project wiki search (Ralf Seidler)
- Enabled Shibboleth authentication support (Matus Banas)
- Zen mode (fullscreen) for issues/MR/notes (Robert Schilling)
- Add ability to configure webhook timeout via gitlab.yml (Wes Gurney)
v 7.2.1
- Delete orphaned labels during label migration (James Brooks)
...
...
This diff is collapsed.
Click to expand it.
app/models/web_hook.rb
View file @
81a70bf5
...
...
@@ -23,7 +23,7 @@ class WebHook < ActiveRecord::Base
default_value_for
:merge_requests_events
,
false
# HTTParty timeout
default_timeout
10
default_timeout
Gitlab
.
config
.
gitlab
.
webhook_timeout
validates
:url
,
presence:
true
,
format:
{
with:
URI
::
regexp
(
%w(http https)
),
message:
"should be a valid url"
}
...
...
This diff is collapsed.
Click to expand it.
config/gitlab.yml.example
View file @
81a70bf5
...
...
@@ -80,6 +80,10 @@ production: &base
snippets: false
visibility_level: "private" # can be "private" | "internal" | "public"
## Webhook settings
# Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
# webhook_timeout: 10
## Repository downloads directory
# When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
# The default is 'tmp/repositories' relative to the root of the Rails app.
...
...
This diff is collapsed.
Click to expand it.
config/initializers/1_settings.rb
View file @
81a70bf5
...
...
@@ -92,6 +92,7 @@ Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant
Settings
.
gitlab
[
'username_changing_enabled'
]
=
true
if
Settings
.
gitlab
[
'username_changing_enabled'
].
nil?
Settings
.
gitlab
[
'issue_closing_pattern'
]
=
'([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)'
if
Settings
.
gitlab
[
'issue_closing_pattern'
].
nil?
Settings
.
gitlab
[
'default_projects_features'
]
||=
{}
Settings
.
gitlab
[
'webhook_timeout'
]
||=
10
Settings
.
gitlab
.
default_projects_features
[
'issues'
]
=
true
if
Settings
.
gitlab
.
default_projects_features
[
'issues'
].
nil?
Settings
.
gitlab
.
default_projects_features
[
'merge_requests'
]
=
true
if
Settings
.
gitlab
.
default_projects_features
[
'merge_requests'
].
nil?
Settings
.
gitlab
.
default_projects_features
[
'wiki'
]
=
true
if
Settings
.
gitlab
.
default_projects_features
[
'wiki'
].
nil?
...
...
This diff is collapsed.
Click to expand it.
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