Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import-url
Showing
.csscomb.json
0 → 100644
This diff is collapsed.
.scss-lint.yml
0 → 100644
This diff is collapsed.
... | @@ -22,6 +22,7 @@ gem 'devise', '~> 3.5.4' | ... | @@ -22,6 +22,7 @@ gem 'devise', '~> 3.5.4' |
gem 'devise-async', '~> 0.9.0' | gem 'devise-async', '~> 0.9.0' | ||
gem 'doorkeeper', '~> 2.2.0' | gem 'doorkeeper', '~> 2.2.0' | ||
gem 'omniauth', '~> 1.3.1' | gem 'omniauth', '~> 1.3.1' | ||
gem 'omniauth-auth0', '~> 1.4.1' | |||
gem 'omniauth-azure-oauth2', '~> 0.0.6' | gem 'omniauth-azure-oauth2', '~> 0.0.6' | ||
gem 'omniauth-bitbucket', '~> 0.0.2' | gem 'omniauth-bitbucket', '~> 0.0.2' | ||
gem 'omniauth-cas3', '~> 1.1.2' | gem 'omniauth-cas3', '~> 1.1.2' | ||
... | @@ -30,7 +31,7 @@ gem 'omniauth-github', '~> 1.1.1' | ... | @@ -30,7 +31,7 @@ gem 'omniauth-github', '~> 1.1.1' |
gem 'omniauth-gitlab', '~> 1.0.0' | gem 'omniauth-gitlab', '~> 1.0.0' | ||
gem 'omniauth-google-oauth2', '~> 0.2.0' | gem 'omniauth-google-oauth2', '~> 0.2.0' | ||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos | gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos | ||
gem 'omniauth-saml', '~> 1.4.2' | gem 'omniauth-saml', '~> 1.5.0' | ||
gem 'omniauth-shibboleth', '~> 1.2.0' | gem 'omniauth-shibboleth', '~> 1.2.0' | ||
gem 'omniauth-twitter', '~> 1.2.0' | gem 'omniauth-twitter', '~> 1.2.0' | ||
gem 'omniauth_crowd', '~> 2.2.0' | gem 'omniauth_crowd', '~> 2.2.0' | ||
... | @@ -50,7 +51,7 @@ gem "browser", '~> 1.0.0' | ... | @@ -50,7 +51,7 @@ gem "browser", '~> 1.0.0' |
# 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", '~> 9.0' | gem "gitlab_git", '~> 10.0' | ||
# LDAP Auth | # LDAP Auth | ||
# GitLab fork with several improvements to original library. For full list of changes | # GitLab fork with several improvements to original library. For full list of changes | ||
... | @@ -58,7 +59,9 @@ gem "gitlab_git", '~> 9.0' | ... | @@ -58,7 +59,9 @@ gem "gitlab_git", '~> 9.0' |
gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" | gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" | ||
# Git Wiki | # Git Wiki | ||
gem 'gollum-lib', '~> 4.1.0' | # Required manually in config/initializers/gollum.rb to control load order | ||
gem 'gollum-lib', '~> 4.1.0', require: false | |||
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false | |||
# Language detection | # Language detection | ||
gem "github-linguist", "~> 4.7.0", require: "linguist" | gem "github-linguist", "~> 4.7.0", require: "linguist" | ||
... | @@ -77,9 +80,6 @@ gem "haml-rails", '~> 0.9.0' | ... | @@ -77,9 +80,6 @@ gem "haml-rails", '~> 0.9.0' |
# Files attachments | # Files attachments | ||
gem "carrierwave", '~> 0.10.0' | gem "carrierwave", '~> 0.10.0' | ||
# Image editing | |||
gem "mini_magick", '~> 4.4.0' | |||
# Drag and Drop UI | # Drag and Drop UI | ||
gem 'dropzonejs-rails', '~> 0.7.1' | gem 'dropzonejs-rails', '~> 0.7.1' | ||
... | @@ -222,6 +222,8 @@ gem 'net-ssh', '~> 3.0.1' | ... | @@ -222,6 +222,8 @@ gem 'net-ssh', '~> 3.0.1' |
# Sentry integration | # Sentry integration | ||
gem 'sentry-raven', '~> 0.15' | gem 'sentry-raven', '~> 0.15' | ||
gem 'premailer-rails', '~> 1.9.0' | |||
# Metrics | # Metrics | ||
group :metrics do | group :metrics do | ||
gem 'allocations', '~> 1.0', require: false, platform: :mri | gem 'allocations', '~> 1.0', require: false, platform: :mri | ||
... | @@ -263,7 +265,9 @@ group :development, :test do | ... | @@ -263,7 +265,9 @@ group :development, :test do |
gem 'database_cleaner', '~> 1.4.0' | gem 'database_cleaner', '~> 1.4.0' | ||
gem 'factory_girl_rails', '~> 4.6.0' | gem 'factory_girl_rails', '~> 4.6.0' | ||
gem 'rspec-rails', '~> 3.3.0' | gem 'rspec-rails', '~> 3.3.0' | ||
gem 'rspec-retry' | |||
gem 'spinach-rails', '~> 0.2.1' | gem 'spinach-rails', '~> 0.2.1' | ||
gem 'spinach-rerun-reporter', '~> 0.0.2' | |||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) | # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) | ||
gem 'minitest', '~> 5.7.0' | gem 'minitest', '~> 5.7.0' | ||
... | @@ -271,9 +275,9 @@ group :development, :test do | ... | @@ -271,9 +275,9 @@ group :development, :test do |
# Generate Fake data | # Generate Fake data | ||
gem 'ffaker', '~> 2.0.0' | gem 'ffaker', '~> 2.0.0' | ||
gem 'capybara', '~> 2.4.0' | gem 'capybara', '~> 2.6.2' | ||
gem 'capybara-screenshot', '~> 1.0.0' | gem 'capybara-screenshot', '~> 1.0.0' | ||
gem 'poltergeist', '~> 1.8.1' | gem 'poltergeist', '~> 1.9.0' | ||
gem 'teaspoon', '~> 1.0.0' | gem 'teaspoon', '~> 1.0.0' | ||
gem 'teaspoon-jasmine', '~> 2.2.0' | gem 'teaspoon-jasmine', '~> 2.2.0' | ||
... | @@ -283,7 +287,8 @@ group :development, :test do | ... | @@ -283,7 +287,8 @@ group :development, :test do |
gem 'spring-commands-spinach', '~> 1.0.0' | gem 'spring-commands-spinach', '~> 1.0.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | gem 'spring-commands-teaspoon', '~> 0.0.2' | ||
gem 'rubocop', '~> 0.35.0', require: false | gem 'rubocop', '~> 0.38.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.10.0', require: false | ||
gem 'flog', require: false | gem 'flog', require: false | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/development/sql.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/integration/auth0.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/update/8.5-to-8.6.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
features/support/rerun.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/devise_failure.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/middleware/go.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/redis_config.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/tasks/gemojione.rake
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/tasks/scss-lint.rake
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
public/logo.svg
deleted
100644 → 0
This diff is collapsed.
public/static.css
deleted
100644 → 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment