Merge branch 'master' into feature/gb/variables-expressions-in-only-except
* master: (199 commits) Conflicts: lib/gitlab/ci/pipeline/seed/stage.rb
Showing
.prettierignore
0 → 100644
This diff is collapsed.
# --- Special code for migrating to Rails 5.0 --- | ||
def rails5? | ||
%w[1 true].include?(ENV["RAILS5"]) | ||
end | ||
gem_versions = {} | ||
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' | ||
gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' | ||
gem_versions['html-pipeline'] = rails5? ? '~> 2.6.0' : '~> 1.11.0' | ||
gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10' | ||
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' | ||
# --- The end of special code for migrating to Rails 5.0 --- | ||
source 'https://rubygems.org' | ||
gem 'rails', '4.2.10' | ||
gem 'rails', gem_versions['rails'] | ||
gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ||
# Responders respond_to and respond_with | ||
... | ... | @@ -9,7 +22,7 @@ gem 'responders', '~> 2.0' |
gem 'sprockets', '~> 3.7.0' | ||
# Default values for AR models | ||
gem 'default_value_for', '~> 3.0.0' | ||
gem 'default_value_for', gem_versions['default_value_for'] | ||
# Supported DBs | ||
gem 'mysql2', '~> 0.4.10', group: :mysql | ||
... | ... | @@ -22,10 +35,10 @@ gem 'faraday', '~> 0.12' |
# Authentication libraries | ||
gem 'devise', '~> 4.2' | ||
gem 'doorkeeper', '~> 4.2.0' | ||
gem 'doorkeeper-openid_connect', '~> 1.2.0' | ||
gem 'omniauth', '~> 1.4.2' | ||
gem 'omniauth-auth0', '~> 1.4.1' | ||
gem 'doorkeeper', '~> 4.3' | ||
gem 'doorkeeper-openid_connect', '~> 1.3' | ||
gem 'omniauth', '~> 1.8' | ||
gem 'omniauth-auth0', '~> 2.0.0' | ||
gem 'omniauth-azure-oauth2', '~> 0.0.9' | ||
gem 'omniauth-cas3', '~> 1.1.4' | ||
gem 'omniauth-facebook', '~> 4.0.0' | ||
... | ... | @@ -34,9 +47,9 @@ gem 'omniauth-gitlab', '~> 1.0.2' |
gem 'omniauth-google-oauth2', '~> 0.5.2' | ||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos | ||
gem 'omniauth-oauth2-generic', '~> 0.2.2' | ||
gem 'omniauth-saml', '~> 1.10.0' | ||
gem 'omniauth-saml', '~> 1.10' | ||
gem 'omniauth-shibboleth', '~> 1.2.0' | ||
gem 'omniauth-twitter', '~> 1.2.0' | ||
gem 'omniauth-twitter', '~> 1.4' | ||
gem 'omniauth_crowd', '~> 2.2.0' | ||
gem 'omniauth-authentiq', '~> 0.3.1' | ||
gem 'rack-oauth2', '~> 1.2.1' | ||
... | ... | @@ -113,7 +126,7 @@ gem 'fog-rackspace', '~> 0.1.1' |
gem 'fog-aliyun', '~> 0.2.0' | ||
# for Google storage | ||
gem 'google-api-client', '~> 0.13.6' | ||
gem 'google-api-client', '~> 0.19.8' | ||
# for aws storage | ||
gem 'unf', '~> 0.1.4' | ||
... | ... | @@ -122,7 +135,7 @@ gem 'unf', '~> 0.1.4' |
gem 'seed-fu', '~> 2.3.7' | ||
# Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | ||
gem 'html-pipeline', gem_versions['html-pipeline'] | ||
gem 'deckar01-task_list', '2.0.0' | ||
gem 'gitlab-markup', '~> 1.6.2' | ||
gem 'redcarpet', '~> 3.4' | ||
... | ... | @@ -149,7 +162,7 @@ group :unicorn do |
end | ||
# State machine | ||
gem 'state_machines-activerecord', '~> 0.4.0' | ||
gem 'state_machines-activerecord', '~> 0.5.1' | ||
# Issue tags | ||
gem 'acts-as-taggable-on', '~> 5.0' | ||
... | ... | @@ -218,10 +231,10 @@ gem 'sanitize', '~> 2.0' |
gem 'babosa', '~> 1.0.2' | ||
# Sanitizes SVG input | ||
gem 'loofah', '~> 2.0.3' | ||
gem 'loofah', '~> 2.2' | ||
# Working with license | ||
gem 'licensee', '~> 8.7.0' | ||
gem 'licensee', '~> 8.9' | ||
# Protect against bruteforcing | ||
gem 'rack-attack', '~> 4.4.1' | ||
... | ... | @@ -235,9 +248,6 @@ gem 'mousetrap-rails', '~> 1.4.6' |
# Detect and convert string character encoding | ||
gem 'charlock_holmes', '~> 0.7.5' | ||
# Faster JSON | ||
gem 'oj', '~> 2.17.4' | ||
# Faster blank | ||
gem 'fast_blank' | ||
... | ... | @@ -269,9 +279,9 @@ gem 'premailer-rails', '~> 1.9.7' |
# I18n | ||
gem 'ruby_parser', '~> 3.8', require: false | ||
gem 'rails-i18n', '~> 4.0.9' | ||
gem 'rails-i18n', gem_versions['rails-i18n'] | ||
gem 'gettext_i18n_rails', '~> 1.8.0' | ||
gem 'gettext_i18n_rails_js', '~> 1.2.0' | ||
gem 'gettext_i18n_rails_js', '~> 1.3' | ||
gem 'gettext', '~> 3.2.2', require: false, group: :development | ||
gem 'batch-loader', '~> 1.2.1' | ||
... | ... | @@ -279,7 +289,6 @@ gem 'batch-loader', '~> 1.2.1' |
# Perf bar | ||
gem 'peek', '~> 1.0.1' | ||
gem 'peek-gc', '~> 0.0.2' | ||
gem 'peek-host', '~> 1.0.0' | ||
gem 'peek-mysql2', '~> 1.1.0', group: :mysql | ||
gem 'peek-performance_bar', '~> 1.3.0' | ||
gem 'peek-pg', '~> 1.3.0', group: :postgres | ||
... | ... | @@ -361,7 +370,7 @@ group :development, :test do |
gem 'license_finder', '~> 3.1', require: false | ||
gem 'knapsack', '~> 1.16' | ||
gem 'activerecord_sane_schema_dumper', '0.2' | ||
gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] | ||
gem 'stackprof', '~> 0.2.10', require: false | ||
... | ... |
Gemfile.rails5
0 → 100644
Gemfile.rails5.lock
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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/models/internal_id.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
bin/update
0 → 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
config/spring.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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/ci/caching/index.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.
doc/img/devops_lifecycle.png
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/user/gitlab_com/index.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.
lib/gitlab/http.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/peek/views/host.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/lib/gitlab/http_spec.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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