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
2 files
+ 6
10
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 11
4
@@ -23,7 +23,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
gem "gitlab_git", '2.1.1'
gem "gitlab_git", "~> 3.0.0.beta1"
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
@@ -111,6 +111,9 @@ gem 'tinder', '~> 1.9.2'
# HipChat integration
gem "hipchat", "~> 0.9.0"
# Flowdock integration
gem "gitlab-flowdock-git-hook", "~> 0.4.2"
# d3
gem "d3_rails", "~> 3.1.4"
@@ -120,6 +123,9 @@ gem "underscore-rails", "~> 1.4.4"
# Sanitize user input
gem "sanitize"
# Protect against bruteforcing
group :assets do
gem "sass-rails"
gem "coffee-rails"
@@ -134,7 +140,7 @@ group :assets do
gem "jquery-rails", "2.1.3"
gem "jquery-ui-rails", "2.0.2"
gem "modernizr", "2.6.2"
gem "raphael-rails", "~> 2.1.2"
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
@@ -142,10 +148,11 @@ group :assets do
end
group :development do
gem "annotate", "~> 2.6.0.beta2"
gem 'quiet_assets', '~> 1.0.1'
# Better errors handler
@@ -187,7 +194,7 @@ group :development, :test do
gem 'rb-inotify', require: linux_only('rb-inotify')
# PhantomJS driver for Capybara
gem 'poltergeist', '~> 1.3.0'
gem 'poltergeist', '~> 1.4.1'
gem 'spork', '~> 1.0rc'
gem 'jasmine'
Loading