Upgrading to GitLab 12.1.0.

Imported Upstream version 4.2.3

parent ba692558

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -7,6 +7,18 @@ before_install:
before_script:
- bundle update
cache: bundler
env:
global:
- JRUBY_OPTS='-J-Xmx1024M'
matrix:
- "GEM=railties"
- "GEM=ap"
- "GEM=am,amo,as,av,aj"
- "GEM=ar:mysql"
- "GEM=ar:mysql2"
- "GEM=ar:sqlite3"
- "GEM=ar:postgresql"
- "GEM=aj:integration"
rvm:
- 1.9.3
- 2.0.0
......@@ -15,18 +27,18 @@ rvm:
- ruby-head
- rbx-2
- jruby
env:
- "GEM=railties"
- "GEM=ap,am,amo,as,av"
- "GEM=ar:mysql"
- "GEM=ar:mysql2"
- "GEM=ar:sqlite3"
- "GEM=ar:postgresql"
matrix:
allow_failures:
- rvm: ruby-head
- rvm: 1.9.3
env: "GEM=ar:mysql"
- rvm: 2.0.0
env: "GEM=ar:mysql"
- rvm: ruby-head
env: "GEM=ar:mysql"
- rvm: rbx-2
- rvm: jruby
- rvm: ruby-head
- env: "GEM=aj:integration"
fast_finish: true
notifications:
email: false
......@@ -43,3 +55,7 @@ notifications:
bundler_args: --without test --jobs 3 --retry 3
services:
- memcached
- redis
- rabbitmq
addons:
postgresql: "9.3"
......@@ -12,5 +12,6 @@ Ruby on Rails is a volunteer effort. We encourage you to pitch in. [Join the tea
* If you have a change or new feature in mind, please [suggest it on the rubyonrails-core mailing list](https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core) and start writing code.
Thanks! :heart: :heart: :heart: <br />
Thanks! :heart: :heart: :heart:
Rails Team
......@@ -2,20 +2,26 @@ source 'https://rubygems.org'
gemspec
# We need a newish Rake since Active Job sets its test tasks' descriptions.
gem 'rake', '>= 10.3'
# This needs to be with require false as it is
# loaded after loading the test library to
# ensure correct loading order
gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 3.1.0'
gem 'jquery-rails', '~> 4.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'
gem 'sprockets', '~> 3.0.0.rc.1'
gem 'execjs', '< 2.5'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
# being dependent on a binary library.
gem 'bcrypt', '~> 3.1.7', require: false
gem 'bcrypt', '~> 3.1.10', require: false
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
......@@ -23,7 +29,7 @@ gem 'uglifier', '>= 1.3.0', require: false
group :doc do
gem 'sdoc', '~> 0.4.0'
gem 'redcarpet', '~> 2.2.2', platforms: :ruby
gem 'redcarpet', '~> 3.1.2', platforms: :ruby
gem 'w3c_validators'
gem 'kindlerb', '0.1.1'
gem 'mustache', '~> 0.99.8'
......@@ -32,6 +38,23 @@ end
# AS
gem 'dalli', '>= 2.2.1'
# ActiveJob
group :job do
gem 'resque', require: false
gem 'resque-scheduler', require: false
gem 'sidekiq', require: false
gem 'sucker_punch', require: false
gem 'delayed_job', require: false
gem 'queue_classic', require: false, platforms: :ruby
gem 'sneakers', '0.1.1.pre', require: false
gem 'que', require: false
gem 'backburner', require: false
gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
gem 'qu-redis', require: false
gem 'delayed_job_active_record', require: false
gem 'sequel', require: false
end
# Add your own local bundler stuff
local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
instance_eval File.read local_gemfile if File.exist? local_gemfile
......@@ -48,6 +71,10 @@ group :test do
# gem 'debugger'
# end
platforms :mri do
gem 'stackprof'
end
gem 'benchmark-ips'
end
......@@ -61,7 +88,7 @@ platforms :ruby do
gem 'sqlite3', '~> 1.3.6'
group :db do
gem 'pg', '>= 0.11.0'
gem 'pg', '>= 0.15.0'
gem 'mysql', '>= 2.9.0'
gem 'mysql2', '>= 0.3.13'
end
......@@ -84,10 +111,16 @@ platforms :jruby do
end
end
platforms :rbx do
# The rubysl-yaml gem doesn't ship with Psych by default
# as it needs libyaml that isn't always available.
gem 'psych', '~> 2.0'
end
# gems that are necessary for ActiveRecord tests with Oracle database
if ENV['ORACLE_ENHANCED']
platforms :ruby do
gem 'ruby-oci8', '>= 2.0.4'
gem 'ruby-oci8', '~> 2.1'
end
gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master'
end
......
GIT
remote: git://github.com/bkeepers/qu.git
revision: d098e2657c92e89a6413bebd9c033930759c061f
branch: master
specs:
qu (0.2.0)
qu-rails (0.2.0)
qu (= 0.2.0)
railties (>= 3.2, < 5)
qu-redis (0.2.0)
qu (= 0.2.0)
redis-namespace
PATH
remote: .
specs:
actionmailer (4.1.10.rc1)
actionpack (= 4.1.10.rc1)
actionview (= 4.1.10.rc1)
actionmailer (4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.10.rc1)
actionview (= 4.1.10.rc1)
activesupport (= 4.1.10.rc1)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.2)
actionview (= 4.2.2)
activesupport (= 4.2.2)
rack (~> 1.6)
rack-test (~> 0.6.2)
actionview (4.1.10.rc1)
activesupport (= 4.1.10.rc1)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.2)
activesupport (= 4.2.2)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.10.rc1)
activesupport (= 4.1.10.rc1)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.2)
activesupport (= 4.2.2)
globalid (>= 0.3.0)
activemodel (4.2.2)
activesupport (= 4.2.2)
builder (~> 3.1)
activerecord (4.1.10.rc1)
activemodel (= 4.1.10.rc1)
activesupport (= 4.1.10.rc1)
arel (~> 5.0.0)
activesupport (4.1.10.rc1)
i18n (~> 0.6, >= 0.6.9)
activerecord (4.2.2)
activemodel (= 4.2.2)
activesupport (= 4.2.2)
arel (~> 6.0)
activesupport (4.2.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
rails (4.1.10.rc1)
actionmailer (= 4.1.10.rc1)
actionpack (= 4.1.10.rc1)
actionview (= 4.1.10.rc1)
activemodel (= 4.1.10.rc1)
activerecord (= 4.1.10.rc1)
activesupport (= 4.1.10.rc1)
rails (4.2.2)
actionmailer (= 4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
activemodel (= 4.2.2)
activerecord (= 4.2.2)
activesupport (= 4.2.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.10.rc1)
sprockets-rails (~> 2.0)
railties (4.1.10.rc1)
actionpack (= 4.1.10.rc1)
activesupport (= 4.1.10.rc1)
railties (= 4.2.2)
sprockets-rails
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)