Fix/panic postgresql error

.gitignore

@@ -5,7 +5,6 @@ debug.log
 .Gemfile
 /.bundle
 /.ruby-version
-/Gemfile.lock
 pkg
 /dist
 /doc/rdoc

.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
+sudo: false
 script: 'ci/travis.rb'
 before_install:
-  - travis_retry gem install bundler
   - "rvm current | grep 'jruby' && export AR_JDBC=true || echo"
+  - "rm ${BUNDLE_GEMFILE}.lock"
+before_script:
+  - bundle update
+cache: bundler
 env:
   global:
     - JRUBY_OPTS='-J-Xmx1024M'
@@ -19,11 +23,13 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
   - ruby-head
   - rbx-2
   - jruby
 matrix:
   allow_failures:
+    - rvm: ruby-head
     - rvm: 1.9.3
       env: "GEM=ar:mysql"
     - rvm: 2.0.0
@@ -32,6 +38,7 @@ matrix:
       env: "GEM=ar:mysql"
     - rvm: rbx-2
     - rvm: jruby
+    - env: "GEM=aj:integration"
   fast_finish: true
 notifications:
   email: false
@@ -45,7 +52,7 @@ notifications:
     on_failure: always
     rooms:
       - secure: "YA1alef1ESHWGFNVwvmVGCkMe4cUy4j+UcNvMUESraceiAfVyRMAovlQBGs6\n9kBRm7DHYBUXYC2ABQoJbQRLDr/1B5JPf/M8+Qd7BKu8tcDC03U01SMHFLpO\naOs/HLXcDxtnnpL07tGVsm0zhMc5N8tq4/L3SHxK7Vi+TacwQzI="
-bundler_args: --path vendor/bundle --without test
+bundler_args: --without test --jobs 3 --retry 3
 services:
   - memcached
   - redis

Gemfile

@@ -28,7 +28,8 @@ group :doc do
   gem 'sdoc', '~> 0.4.0'
   gem 'redcarpet', '~> 3.1.2', platforms: :ruby
   gem 'w3c_validators'
-  gem 'kindlerb'
+  gem 'kindlerb', '0.1.1'
+  gem 'mustache', '~> 0.99.8'
 end
 
 # AS
@@ -41,7 +42,7 @@ group :job do
   gem 'sidekiq', require: false
   gem 'sucker_punch', require: false
   gem 'delayed_job', require: false
-  gem 'queue_classic', "< 3.0.0", require: false, platforms: :ruby
+  gem 'queue_classic', require: false, platforms: :ruby
   gem 'sneakers', '0.1.1.pre', require: false
   gem 'que', require: false
   gem 'backburner', require: false

Gemfile.lock

@@ -0,0 +1,273 @@
+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.2.1.rc1)
+      actionpack (= 4.2.1.rc1)
+      actionview (= 4.2.1.rc1)
+      activejob (= 4.2.1.rc1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1.rc1)
+      actionview (= 4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      builder (~> 3.1)
+    activerecord (4.2.1.rc1)
+      activemodel (= 4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      arel (~> 6.0)
+    activesupport (4.2.1.rc1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    rails (4.2.1.rc1)
+      actionmailer (= 4.2.1.rc1)
+      actionpack (= 4.2.1.rc1)
+      actionview (= 4.2.1.rc1)
+      activejob (= 4.2.1.rc1)
+      activemodel (= 4.2.1.rc1)
+      activerecord (= 4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1.rc1)
+      sprockets-rails
+    railties (4.2.1.rc1)
+      actionpack (= 4.2.1.rc1)
+      activesupport (= 4.2.1.rc1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    amq-protocol (1.9.2)
+    arel (6.0.0)
+    backburner (0.4.6)
+      beaneater (~> 0.3.1)
+      dante (~> 0.1.5)
+    bcrypt (3.1.10)
+    beaneater (0.3.3)
+    benchmark-ips (2.1.1)
+    builder (3.2.2)
+    bunny (1.1.9)
+      amq-protocol (>= 1.9.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-source
+      execjs
+    coffee-script-source (1.9.0)
+    connection_pool (2.1.1)
+    dalli (2.7.2)
+    dante (0.1.5)
+    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)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
+    hike (1.2.3)
+    hitimes (1.2.2)
+    i18n (0.7.0)
+    jquery-rails (4.0.3)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.2)
+    kindlerb (0.1.1)
+      mustache
+      nokogiri
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    metaclass (0.0.4)
+    mime-types (2.4.3)
+    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.10.1)
+    mustache (0.99.8)
+    mysql (2.9.1)
+    mysql2 (0.3.18)
+    nokogiri (1.6.6.2)
+      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)
+    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.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    redcarpet (3.1.2)
+    redis (3.2.1)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-scheduler (4.0.0)
+      mono_logger (~> 1.0)
+      redis (~> 3.0)
+      resque (~> 1.25)
+      rufus-scheduler (~> 3.0)
+    ruby-prof (0.11.3)
+    rufus-scheduler (3.0.9)
+      tzinfo
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    sequel (4.19.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 (0.1.1.pre)
+      bunny (~> 1.1.3)
+      serverengine
+      thor
+      thread
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    stackprof (0.2.7)
+    sucker_punch (1.3.2)
+      celluloid (~> 0.16.0)
+    thor (0.19.1)
+    thread (0.1.5)
+    thread_safe (0.3.4)
+    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)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    w3c_validators (1.2)
+      json
+      nokogiri
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcmysql-adapter (>= 1.3.0)
+  activerecord-jdbcpostgresql-adapter (>= 1.3.0)
+  activerecord-jdbcsqlite3-adapter (>= 1.3.0)
+  backburner
+  bcrypt (~> 3.1.7)
+  benchmark-ips
+  coffee-rails (~> 4.1.0)
+  dalli (>= 2.2.1)
+  delayed_job
+  delayed_job_active_record
+  jquery-rails (~> 4.0)
+  json
+  kindlerb (= 0.1.1)
+  minitest (< 5.3.4)
+  mocha (~> 0.14)
+  mustache (~> 0.99.8)
+  mysql (>= 2.9.0)
+  mysql2 (>= 0.3.13)
+  nokogiri (>= 1.4.5)
+  pg (>= 0.15.0)
+  psych (~> 2.0)
+  qu-rails!
+  qu-redis
+  que
+  queue_classic
+  racc (>= 1.4.6)
+  rack-cache (~> 1.2)
+  rails!
+  rake (>= 10.3)
+  redcarpet (~> 3.1.2)
+  resque
+  resque-scheduler
+  ruby-prof (~> 0.11.2)
+  sdoc (~> 0.4.0)
+  sequel
+  sidekiq
+  sneakers (= 0.1.1.pre)
+  sqlite3 (~> 1.3.6)
+  stackprof
+  sucker_punch
+  turbolinks
+  uglifier (>= 1.3.0)
+  w3c_validators

RAILS_VERSION

@@ -1 +1 @@
-4.2.0.beta4
+4.2.1

README.md

@@ -78,7 +78,7 @@ We encourage you to contribute to Ruby on Rails! Please check out the
 
 ## Code Status
 
-* [![Build Status](https://travis-ci.org/rails/rails.svg?branch=master)](https://travis-ci.org/rails/rails)
+* [![Build Status](https://travis-ci.org/rails/rails.svg?branch=4-2-stable)](https://travis-ci.org/rails/rails)
 
 ## License
 

actionmailer/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Rails 4.2.1 (March 19, 2014) ##
+
+* No changes *
+
+
+## Rails 4.2.0 (December 20, 2014) ##
+
 *   `MailerGenerator` now generates layouts by default. The HTML mailer layout
     now includes `<html>` and `<body>` tags which improve the spam rating in
     some spam detection engines. Mailers now inherit from `ApplicationMailer`

actionmailer/README.rdoc

@@ -150,7 +150,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/actionmailer
+* https://github.com/rails/rails/tree/4-2-stable/actionmailer
 
 
 == License

actionmailer/lib/action_mailer/base.rb

@@ -58,7 +58,7 @@ module ActionMailer
   #
   # The mail method, if not passed a block, will inspect your views and send all the views with
   # the same name as the method, so the above action would send the +welcome.text.erb+ view
-  # file as well as the +welcome.text.html.erb+ view file in a +multipart/alternative+ email.
+  # file as well as the +welcome.html.erb+ view file in a +multipart/alternative+ email.
   #
   # If you want to explicitly render only certain templates, pass a block:
   #
@@ -498,7 +498,7 @@ def mailer_name
 
       # Sets the defaults through app configuration:
       #
-      #     config.action_mailer.default { from: "no-reply@example.org" }
+      #     config.action_mailer.default(from: "no-reply@example.org")
       #
       # Aliased by ::default_options=
       def default(value = nil)