Merged 7.6.1
Showing
... | @@ -31,10 +31,11 @@ gem 'omniauth-google-oauth2' | ... | @@ -31,10 +31,11 @@ gem 'omniauth-google-oauth2' |
gem 'omniauth-twitter' | gem 'omniauth-twitter' | ||
gem 'omniauth-github' | gem 'omniauth-github' | ||
gem 'omniauth-shibboleth' | gem 'omniauth-shibboleth' | ||
gem 'omniauth-kerberos' | |||
# Extracting information from a git repository | # Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | # Provide access to Gitlab::Git library | ||
gem "gitlab_git", '7.0.0.rc11' | gem "gitlab_git", '7.0.0.rc12' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | # Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
... | @@ -115,7 +116,7 @@ gem "acts-as-taggable-on" | ... | @@ -115,7 +116,7 @@ gem "acts-as-taggable-on" |
# Background jobs | # Background jobs | ||
gem 'slim' | gem 'slim' | ||
gem 'sinatra', require: nil | gem 'sinatra', require: nil | ||
gem 'sidekiq', '2.17.0' | gem 'sidekiq', '2.17.8' | ||
# HTTP requests | # HTTP requests | ||
gem "httparty" | gem "httparty" | ||
... | @@ -137,7 +138,7 @@ gem "redis-rails" | ... | @@ -137,7 +138,7 @@ gem "redis-rails" |
gem 'tinder', '~> 1.9.2' | gem 'tinder', '~> 1.9.2' | ||
# HipChat integration | # HipChat integration | ||
gem "hipchat", "~> 0.14.0" | gem "hipchat", "~> 1.4.0" | ||
# Flowdock integration | # Flowdock integration | ||
gem "gitlab-flowdock-git-hook", "~> 0.4.2" | gem "gitlab-flowdock-git-hook", "~> 0.4.2" | ||
... | ... |