Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into gitlab-workhorse-0.7.2
Showing
... | @@ -290,7 +290,7 @@ group :development, :test do | ... | @@ -290,7 +290,7 @@ group :development, :test do |
gem 'rubocop', '~> 0.38.0', require: false | gem 'rubocop', '~> 0.38.0', require: false | ||
gem 'scss_lint', '~> 0.47.0', require: false | gem 'scss_lint', '~> 0.47.0', require: false | ||
gem 'coveralls', '~> 0.8.2', require: false | gem 'coveralls', '~> 0.8.2', require: false | ||
gem 'simplecov', '~> 0.10.0', require: false | gem 'simplecov', '~> 0.11.0', require: false | ||
gem 'flog', require: false | gem 'flog', require: false | ||
gem 'flay', require: false | gem 'flay', require: false | ||
gem 'bundler-audit', require: false | gem 'bundler-audit', require: false | ||
... | ... |
lib/gitlab/saml/auth_hash.rb
0 → 100644
lib/gitlab/saml/config.rb
0 → 100644
This diff is collapsed.
Please register or sign in to comment