Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (372 commits) Enable Lint/StringConversionInInterpolation cop and autocorrect offenses resolve duplicated changelog entry credit myself😄 change determine conditions override subject method in devise mailer follow the styleguide: Don't use parentheses around a literal wrap subject with method subject move spec back into shared example `an email sent from GitLab` stub config settings in spec remove empty line at block body end remove extra entry create new test in `spec/mailers/notify_spec.rb` move changelog to 8.13 add configurable email subject suffix Fixes sidebar navigation. Convert "SSH Keys" Spinach features to RSpec Enable import/export back for non-admins Update gitlab-shell to 3.6.3 Updated artwork of empty group state. Better empty state for Groups view. ...
Showing
This diff is collapsed.
... | @@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' | ... | @@ -6,10 +6,8 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' |
# Responders respond_to and respond_with | # Responders respond_to and respond_with | ||
gem 'responders', '~> 2.0' | gem 'responders', '~> 2.0' | ||
# Specify a sprockets version due to increased performance | gem 'sprockets', '~> 3.7.0' | ||
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 | gem 'sprockets-es6', '~> 0.9.2' | ||
gem 'sprockets', '~> 3.6.0' | |||
gem 'sprockets-es6' | |||
# Default values for AR models | # Default values for AR models | ||
gem 'default_value_for', '~> 3.0.0' | gem 'default_value_for', '~> 3.0.0' | ||
... | @@ -19,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql | ... | @@ -19,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql |
gem 'pg', '~> 0.18.2', group: :postgres | gem 'pg', '~> 0.18.2', group: :postgres | ||
# Authentication libraries | # Authentication libraries | ||
gem 'devise', '~> 4.0' | gem 'devise', '~> 4.2' | ||
gem 'doorkeeper', '~> 4.2.0' | gem 'doorkeeper', '~> 4.2.0' | ||
gem 'omniauth', '~> 1.3.1' | gem 'omniauth', '~> 1.3.1' | ||
gem 'omniauth-auth0', '~> 1.4.1' | gem 'omniauth-auth0', '~> 1.4.1' | ||
... | @@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' | ... | @@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' |
# 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', '~> 10.6.6' | gem 'gitlab_git', '~> 10.6.7' | ||
# 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 | ||
... | @@ -102,7 +100,7 @@ gem 'seed-fu', '~> 2.3.5' | ... | @@ -102,7 +100,7 @@ gem 'seed-fu', '~> 2.3.5' |
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | gem 'html-pipeline', '~> 1.11.0' | ||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' | gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' | ||
gem 'github-markup', '~> 1.4' | gem 'github-markup', '~> 1.4' | ||
gem 'redcarpet', '~> 3.3.3' | gem 'redcarpet', '~> 3.3.3' | ||
gem 'RedCloth', '~> 4.3.2' | gem 'RedCloth', '~> 4.3.2' | ||
... | @@ -122,8 +120,8 @@ gem 'diffy', '~> 3.0.3' | ... | @@ -122,8 +120,8 @@ gem 'diffy', '~> 3.0.3' |
# Application server | # Application server | ||
group :unicorn do | group :unicorn do | ||
gem 'unicorn', '~> 4.9.0' | gem 'unicorn', '~> 5.1.0' | ||
gem 'unicorn-worker-killer', '~> 0.4.2' | gem 'unicorn-worker-killer', '~> 0.4.4' | ||
end | end | ||
# State machine | # State machine | ||
... | @@ -212,7 +210,7 @@ gem 'oj', '~> 2.17.4' | ... | @@ -212,7 +210,7 @@ gem 'oj', '~> 2.17.4' |
gem 'chronic', '~> 0.10.2' | gem 'chronic', '~> 0.10.2' | ||
gem 'chronic_duration', '~> 0.10.6' | gem 'chronic_duration', '~> 0.10.6' | ||
gem 'sass-rails', '~> 5.0.0' | gem 'sass-rails', '~> 5.0.6' | ||
gem 'coffee-rails', '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem 'uglifier', '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
gem 'turbolinks', '~> 2.5.0' | gem 'turbolinks', '~> 2.5.0' | ||
... | @@ -298,11 +296,10 @@ group :development, :test do | ... | @@ -298,11 +296,10 @@ group :development, :test do |
gem 'spring-commands-teaspoon', '~> 0.0.2' | gem 'spring-commands-teaspoon', '~> 0.0.2' | ||
gem 'rubocop', '~> 0.42.0', require: false | gem 'rubocop', '~> 0.42.0', require: false | ||
gem 'rubocop-rspec', '~> 1.7.0', require: false | gem 'rubocop-rspec', '~> 1.5.0', require: false | ||
gem 'scss_lint', '~> 0.47.0', require: false | gem 'scss_lint', '~> 0.47.0', require: false | ||
gem 'haml_lint', '~> 0.18.2', require: false | gem 'haml_lint', '~> 0.18.2', require: false | ||
gem 'simplecov', '0.12.0', require: false | gem 'simplecov', '0.12.0', require: false | ||
gem 'flog', '~> 4.3.2', require: false | |||
gem 'flay', '~> 2.6.1', require: false | gem 'flay', '~> 2.6.1', require: false | ||
gem 'bundler-audit', '~> 0.5.0', require: false | gem 'bundler-audit', '~> 0.5.0', require: false | ||
... | @@ -322,10 +319,6 @@ group :test do | ... | @@ -322,10 +319,6 @@ group :test do |
gem 'timecop', '~> 0.8.0' | gem 'timecop', '~> 0.8.0' | ||
end | end | ||
group :production do | |||
gem 'gitlab_meta', '7.0' | |||
end | |||
gem 'newrelic_rpm', '~> 3.16' | gem 'newrelic_rpm', '~> 3.16' | ||
gem 'octokit', '~> 4.3.0' | gem 'octokit', '~> 4.3.0' | ||
... | @@ -334,7 +327,7 @@ gem 'mail_room', '~> 0.8' | ... | @@ -334,7 +327,7 @@ gem 'mail_room', '~> 0.8' |
gem 'email_reply_parser', '~> 0.5.8' | gem 'email_reply_parser', '~> 0.5.8' | ||
gem 'ruby-prof', '~> 0.15.9' | gem 'ruby-prof', '~> 0.16.2' | ||
## CI | ## CI | ||
gem 'activerecord-session_store', '~> 1.0.0' | gem 'activerecord-session_store', '~> 1.0.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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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/frontend.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/university/README.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.
doc/update/8.12-to-8.13.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.
lib/tasks/flog.rake
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.
spec/lib/gitlab/git_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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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