Remove travis hooks for notifications
Don't build against ruby < 1.9.3
README
Run only mysql2 test on travis
Skip broken test becouse of mysql bug
Update mocha

Fixes stack level too deep errors in railties

Conflicts:
	Gemfile
Update rack dependency to 1.4.x

Conflicts:
	actionpack/actionpack.gemspec
Backport `rake db:structure:dump`

Don't require env globally
Escalate missing error when :raise is true

Before ec16ba75a5493b9da972eea08bae630eba35b62f,
ActionView::Helpers::TranslationHelper#translate has raised errors with
specifying options[:raise] to true.

This should work by this fix:

     begin
       t(:"translations.missing", raise: true)
     rescue I18n::MissingTranslationData
       p :hello!
     end

Conflicts:
	actionpack/CHANGELOG.md
Rails config for raise on missing translations

Add a config to setup whether raise exception for missing translation or
not.

Conflicts:
	actionview/CHANGELOG.md
	actionview/lib/action_view/base.rb
	guides/source/configuring.md
	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

Conflicts:
	actionpack/lib/action_view/base.rb
Length validation handles correctly nil. Fix #7180

When nil or empty string are not allowed, they are not valid.

Conflicts:
	activemodel/CHANGELOG.md
	activemodel/lib/active_model/validations/length.rb
	activemodel/test/cases/validations/length_validation_test.rb

Conflicts:
	activemodel/lib/active_model/validations/length.rb
True, False, and Nil should be represented in as_json as themselves.

Conflicts:
	activesupport/lib/active_support/json/encoding.rb
Fix i18n number helper tests
Merge route requirements

This was fixed upstream in rails@9b4514c
Escape format, negative_format and units options of number helpers

Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081

Conflicts:
	actionpack/test/template/number_helper_test.rb
Merge pull request #38 from square/forward-port-back-ports

Patch all the things
backport rails/rails@0f3b7d1a319383f743
Fixes: CVE-2014-0130