Merge branch 'master' of github.com:rails/rails

Conflicts:
	guides/source/security.md

Author: vijaydev

.travis.yml

@@ -21,16 +21,12 @@ env:
     - "GEM=aj:integration"
     - "GEM=guides"
 rvm:
-  - 2.2.2
+  - 2.2.3
   - ruby-head
-  - rbx-2
-  - jruby-head
 matrix:
   allow_failures:
     - env: "GEM=ar:mysql"
     - rvm: ruby-head
-    - rvm: rbx-2
-    - rvm: jruby-head
   fast_finish: true
 notifications:
   email: false

CODE_OF_CONDUCT.md

@@ -0,0 +1,12 @@
+# Contributor Code of Conduct
+
+The Rails team is committed to fostering a welcoming community.
+
+**Our Code of Conduct can be found here**:
+
+http://rubyonrails.org/conduct/
+
+For a history of updates, see the page history here:
+
+https://github.com/rails/rails.github.com/commits/master/conduct/index.html
+

Gemfile

@@ -7,6 +7,7 @@ gem 'rake', '>= 10.3'
 
 # Active Job depends on the URI::GID::MissingModelIDError, which isn't released yet.
 gem 'globalid', github: 'rails/globalid'
+gem 'rack', github: 'rack/rack'
 
 # This needs to be with require false as it is
 # loaded after loading the test library to
@@ -20,8 +21,9 @@ gem 'turbolinks'
 gem 'arel', github: 'rails/arel', branch: 'master'
 gem 'mail', github: 'mikel/mail'
 
-gem 'sprockets', '~> 3.0.0.rc.1'
+gem 'sprockets', github: 'rails/sprockets', branch: 'master'
 gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
+gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid ActiveModel (and by extension the entire framework)
@@ -31,6 +33,7 @@ gem 'bcrypt', '~> 3.1.10', require: false
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
 gem 'uglifier', '>= 1.3.0', require: false
+gem 'sass', '>= 3.3', require: false
 
 group :doc do
   gem 'sdoc', '~> 0.4.0'
@@ -49,7 +52,7 @@ group :job do
   gem 'sidekiq', require: false
   gem 'sucker_punch', require: false
   gem 'delayed_job', require: false
-  gem 'queue_classic', require: false, platforms: :ruby
+  gem 'queue_classic', github: "QueueClassic/queue_classic", require: false, platforms: :ruby
   gem 'sneakers', require: false
   gem 'que', require: false
   gem 'backburner', require: false

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/QueueClassic/queue_classic.git
+  revision: d144db29f1436e9e8b3c7a1a1ecd4442316a9ecd
+  specs:
+    queue_classic (3.2.0.alpha)
+      pg (>= 0.17, < 0.19)
+
 GIT
   remote: git://github.com/bkeepers/qu.git
   revision: d098e2657c92e89a6413bebd9c033930759c061f
@@ -13,44 +20,70 @@ GIT
 
 GIT
   remote: git://github.com/mikel/mail.git
-  revision: b159e0a542962fdd5e292a48cfffa560d7cf412e
+  revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce
   specs:
     mail (2.6.3.edge)
       mime-types (>= 1.16, < 3)
 
+GIT
+  remote: git://github.com/rack/rack.git
+  revision: c94e22401d4719b4d78378c7b63362cd692f9005
+  specs:
+    rack (2.0.0.alpha)
+      json
+
 GIT
   remote: git://github.com/rails/arel.git
-  revision: aac9da257f291ad8d2d4f914528881c240848bb2
+  revision: d5432b4616ff43fbb14540d351eed351e21bb20e
   branch: master
   specs:
     arel (7.0.0.alpha)
 
 GIT
   remote: git://github.com/rails/globalid.git
-  revision: 4df66fb9e9f0c832d29119aa8bc30be55a614b71
+  revision: 8178ff2dc898a8f49dd71f6eb46f2a09712462de
   specs:
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
 
 GIT
   remote: git://github.com/rails/jquery-rails.git
-  revision: 272abdd319bb3381b23182b928b25320590096b0
+  revision: 38053f45402f1ccc4cce5dd8c7005ec707376db3
   branch: master
   specs:
-    jquery-rails (4.0.3)
+    jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
 
+GIT
+  remote: git://github.com/rails/sass-rails.git
+  revision: 805cb17722b8a13ff00dffe20283a6ba2c9a45dc
+  branch: master
+  specs:
+    sass-rails (6.0.0)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.3)
+      sprockets (>= 4.0)
+      sprockets-rails (< 4.0)
+
 GIT
   remote: git://github.com/rails/sprockets-rails.git
-  revision: 85b89c44ad40af3056899808475e6e4bf65c1f5a
+  revision: e65e088575be4f6b994823b80a277affb0a57a5e
   branch: master
   specs:
-    sprockets-rails (3.0.0.beta1)
+    sprockets-rails (3.0.0.beta2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
-      sprockets (>= 3.0.0, < 4.0)
+      sprockets (>= 3.0.0)
+
+GIT
+  remote: git://github.com/rails/sprockets.git
+  revision: a61550db7184fc83964fb983547ff09da9efa9be
+  branch: master
+  specs:
+    sprockets (4.0.0)
+      rack (~> 2.x)
 
 PATH
   remote: .
@@ -64,7 +97,7 @@ PATH
     actionpack (5.0.0.alpha)
       actionview (= 5.0.0.alpha)
       activesupport (= 5.0.0.alpha)
-      rack (~> 1.6)
+      rack (~> 2.x)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
@@ -85,8 +118,10 @@ PATH
       activesupport (= 5.0.0.alpha)
       arel (= 7.0.0.alpha)
     activesupport (5.0.0.alpha)
+      concurrent-ruby (~> 0.9.0)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
+      method_source
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -111,83 +146,73 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (1.9.2)
-    backburner (0.4.6)
-      beaneater (~> 0.3.1)
-      dante (~> 0.1.5)
+    amq-protocol (2.0.0)
+    backburner (1.0.0)
+      beaneater (~> 1.0)
+      dante (> 0.1.5)
     bcrypt (3.1.10)
     bcrypt (3.1.10-x64-mingw32)
     bcrypt (3.1.10-x86-mingw32)
-    beaneater (0.3.3)
-    benchmark-ips (2.1.1)
+    beaneater (1.0.0)
+    benchmark-ips (2.3.0)
     builder (3.2.2)
-    bunny (1.7.0)
+    bunny (2.0.0)
       amq-protocol (>= 1.9.2)
-    byebug (4.0.5)
-      columnize (= 0.9.0)
+    byebug (6.0.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.0)
-    columnize (0.9.0)
-    connection_pool (2.1.1)
-    dalli (2.7.2)
-    dante (0.1.5)
+    coffee-script-source (1.9.1.1)
+    concurrent-ruby (0.9.1)
+    connection_pool (2.2.0)
+    dalli (2.7.4)
+    dante (0.2.0)
     delayed_job (4.0.6)
       activesupport (>= 3.0, < 5.0)
     delayed_job_active_record (4.0.3)
       activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.6.0)
     hitimes (1.2.2)
     hitimes (1.2.2-x86-mingw32)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     kindlerb (0.1.1)
       mustache
       nokogiri
-    loofah (2.0.1)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
     minitest (5.3.3)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.11.0)
-    mustache (1.0.0)
+    multi_json (1.11.2)
+    mustache (1.0.2)
     mysql (2.9.1)
-    mysql2 (0.3.18)
+    mysql2 (0.3.19)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-x64-mingw32)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-x86-mingw32)
-      mini_portile (~> 0.6.0)
-    pg (0.18.1)
-    psych (2.0.13)
-    que (0.9.2)
-    queue_classic (3.1.0)
-      pg (>= 0.17, < 0.19)
+    pg (0.18.2)
+    psych (2.0.15)
+    que (0.10.0)
     racc (1.4.12)
-    rack (1.6.0)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.5.3)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -197,7 +222,7 @@ GEM
     rdoc (4.2.0)
     redcarpet (3.2.3)
     redis (3.2.1)
-    redis-namespace (1.5.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)
@@ -210,47 +235,42 @@ GEM
       redis (~> 3.0)
       resque (~> 1.25)
       rufus-scheduler (~> 3.0)
-    rufus-scheduler (3.0.9)
-      tzinfo
+    rufus-scheduler (3.1.3)
+    sass (3.4.17)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    sequel (4.19.0)
+    sequel (4.25.0)
     serverengine (1.5.10)
       sigdump (~> 0.2.2)
-    sidekiq (3.3.2)
-      celluloid (>= 0.16.0)
-      connection_pool (>= 2.1.1)
-      json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    sigdump (0.2.2)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sneakers (1.0.4)
-      bunny (~> 1.7.0)
+    sidekiq (3.4.2)
+      celluloid (~> 0.16.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      json (~> 1.0)
+      redis (~> 3.2, >= 3.2.1)
+      redis-namespace (~> 1.5, >= 1.5.2)
+    sigdump (0.2.3)
+    sinatra (1.0)
+      rack (>= 1.0)
+    sneakers (1.1.1)
+      bunny (>= 1.7.0, <= 2.0.0)
       serverengine (~> 1.5.5)
       thor
       thread (~> 0.1.7)
-    sprockets (3.0.2)
-      rack (~> 1.0)
     sqlite3 (1.3.10)
     stackprof (0.2.7)
-    sucker_punch (1.3.2)
-      celluloid (~> 0.16.0)
+    sucker_punch (1.5.1)
+      celluloid (= 0.16.0)
     thor (0.19.1)
     thread (0.1.7)
     thread_safe (0.3.5)
-    tilt (1.4.1)
     timers (4.0.1)
       hitimes
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     vegas (0.1.11)
@@ -292,19 +312,22 @@ DEPENDENCIES
   qu-rails!
   qu-redis
   que
-  queue_classic
+  queue_classic!
   racc (>= 1.4.6)
+  rack!
   rack-cache (~> 1.2)
   rails!
   rake (>= 10.3)
   redcarpet (~> 3.2.3)
   resque
   resque-scheduler
+  sass (>= 3.3)
+  sass-rails!
   sdoc (~> 0.4.0)
   sequel
   sidekiq
   sneakers
-  sprockets (~> 3.0.0.rc.1)
+  sprockets!
   sprockets-rails!
   sqlite3 (~> 1.3.6)
   stackprof
@@ -314,4 +337,4 @@ DEPENDENCIES
   w3c_validators
 
 BUNDLED WITH
-   1.10.5
+   1.10.6