Merge pull request #1 from rails/master

Merging latest rails/master

.gitattributes

@@ -0,0 +1,2 @@
+*.rb diff=ruby
+*.gemspec diff=ruby

.github/issue_template.md

@@ -0,0 +1,15 @@
+### Steps to reproduce
+
+(Guidelines for creating a bug report are [available
+here](http://guides.rubyonrails.org/contributing_to_ruby_on_rails.html#creating-a-bug-report))
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### System configuration
+**Rails version**:
+
+**Ruby version**:

.github/pull_request_template.md

@@ -0,0 +1,18 @@
+### Summary
+
+Provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together.
+
+### Other Information
+
+If there's anything else that's important and relevant to your pull
+request, mention that information here. This could include
+benchmarks, or other information.
+
+Finally, if your pull request affects documentation or any non-code
+changes, guidelines for those changes are [available
+here](http://guides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation)
+
+Thanks for contributing to Rails!

.travis.yml

@@ -1,36 +1,72 @@
 language: ruby
 sudo: false
-script: 'ci/travis.rb'
+
+cache:
+  bundler: true
+  directories:
+    - /tmp/cache/unicode_conformance
+    - /tmp/beanstalkd-1.10
+
+services:
+  - memcached
+  - redis
+  - rabbitmq
+
+addons:
+  postgresql: "9.4"
+
+bundler_args: --without test --jobs 3 --retry 3
+#FIXME: Remove bundler uninstall on Travis when https://github.com/bundler/bundler/issues/4493 is fixed.
 before_install:
-  - gem install bundler
+  - rvm @global do gem uninstall bundler --all --ignore-dependencies --executables
+  - rvm @global do gem install bundler -v '1.11.2'
+  - bundle --version
   - "rm ${BUNDLE_GEMFILE}.lock"
-  - curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp
-  - cd /tmp/beanstalkd-1.10/
-  - make
-  - ./beanstalkd &
-  - cd $TRAVIS_BUILD_DIR
+  - "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)"
+  - "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd"
+
 before_script:
   - bundle update
-cache: bundler
+
+script: 'ci/travis.rb'
+
 env:
   matrix:
     - "GEM=railties"
     - "GEM=ap"
     - "GEM=ac"
+    - "GEM=ac FAYE=1"
     - "GEM=am,amo,as,av,aj"
+    - "GEM=as PRESERVE_TIMEZONES=1"
     - "GEM=ar:mysql2"
     - "GEM=ar:sqlite3"
     - "GEM=ar:postgresql"
     - "GEM=aj:integration"
     - "GEM=guides"
+
 rvm:
-  - 2.2.4
-  - 2.3.0
+  - 2.2.5
+  - 2.3.1
   - ruby-head
+
 matrix:
+  include:
+    # Latest compiled version in http://rubies.travis-ci.org
+    - rvm: 2.3.1
+      env:
+        - "GEM=ar:mysql2"
+      addons:
+        mariadb: 10.0
+    - rvm: jruby-9.0.5.0
+      jdk: oraclejdk8
+      env:
+        - "JRUBY_OPTS='--dev -J-Xmx1024M'"
+        - "GEM='ap'"
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-9.0.5.0
   fast_finish: true
+
 notifications:
   email: false
   irc:
@@ -43,10 +79,3 @@ notifications:
     on_failure: always
     rooms:
       - secure: "YA1alef1ESHWGFNVwvmVGCkMe4cUy4j+UcNvMUESraceiAfVyRMAovlQBGs6\n9kBRm7DHYBUXYC2ABQoJbQRLDr/1B5JPf/M8+Qd7BKu8tcDC03U01SMHFLpO\naOs/HLXcDxtnnpL07tGVsm0zhMc5N8tq4/L3SHxK7Vi+TacwQzI="
-bundler_args: --without test --jobs 3 --retry 3
-services:
-  - memcached
-  - redis
-  - rabbitmq
-addons:
-  postgresql: "9.4"

Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
-gem 'rake', '>= 10.3'
+gem 'rake', '>= 11.1'
 
-# This needs to be with require false to ensure correct loading order, as has to
+# This needs to be with require false to ensure correct loading order, as it has to
 # be loaded after loading the test library.
 gem 'mocha', '~> 0.14', require: false
 
@@ -17,13 +17,7 @@ gem 'turbolinks', github: 'turbolinks/turbolinks-rails'
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid Active Model (and by extension the entire framework)
 # being dependent on a binary library.
-platforms :mingw, :x64_mingw, :mswin, :mswin64 do
-  gem 'bcrypt-ruby', '~> 3.0.0', require: false
-end
-
-platforms :ruby, :jruby, :rbx do
-  gem 'bcrypt', '~> 3.1.10', require: false
-end
+gem 'bcrypt', '~> 3.1.11', require: false
 
 # This needs to be with require false to avoid it being automatically loaded by
 # sprockets.
@@ -45,7 +39,7 @@ gem 'listen', '~> 3.0.5', require: false
 
 # Active Job.
 group :job do
-  gem 'resque', require: false
+  gem 'resque', '< 1.26', require: false
   gem 'resque-scheduler', require: false
   gem 'sidekiq', require: false
   gem 'sucker_punch', require: false
@@ -98,7 +92,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
 
   group :db do
     gem 'pg', '>= 0.18.0'
-    gem 'mysql2', '>= 0.4.0'
+    gem 'mysql2', '>= 0.4.4'
   end
 end
 
@@ -135,3 +129,4 @@ end
 # A gem necessary for Active Record tests with IBM DB.
 gem 'ibm_db' if ENV['IBM_DB']
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'wdm', '>= 0.1.0', platforms: [:mingw, :mswin, :x64_mingw, :mswin64]