aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19295 from square/aj-instancesJeremy Kemper2015-03-1119-153/+174
|\
| * `ActiveJob::QueueAdapters::*` are no longer singletonsTamir Duberstein2015-03-1118-152/+173
| * Fix naming collisionTamir Duberstein2015-03-111-1/+1
* | Revert "Merge pull request #15476 from JacobEvelyn/master"Jeremy Kemper2015-03-112-10/+0
|/
* Merge pull request #19289 from ahmad-alkheat/masterYves Senn2015-03-111-1/+1
|\
| * Unnecessary usage of self in the guidesAhmad Al-kheat2015-03-111-1/+1
* | Merge pull request #19288 from yui-knk/fix/routingAbdelkader Boudih2015-03-111-1/+1
|\ \
| * | [ci skip] Change to code elementyui-knk2015-03-111-1/+1
|/ /
* | pg, `disable_referential_integrity` only catches AR errors.Yves Senn2015-03-112-3/+25
* | fix typo in transaction argument. Closes #19265.Yves Senn2015-03-111-1/+1
* | Merge pull request #19280 from palkan/fix-pg-json-testYves Senn2015-03-111-0/+1
|\ \
| * | Fix json_testpalkan2015-03-111-0/+1
|/ /
* | Use the released gemRafael Mendonça França2015-03-102-10/+2
* | Merge pull request #19252 from kaspth/single-escaping-strip-tagsRafael Mendonça França2015-03-106-7/+19
|\ \
| * | Let strip_tags leave HTML escaping to Rails.Kasper Timm Hansen2015-03-106-7/+19
* | | Add YAML compatibility for objects from Rails 4.2Sean Griffin2015-03-104-27/+239
* | | Attempt to provide backwards compatible YAML deserializationSean Griffin2015-03-104-0/+76
* | | Merge pull request #19275 from keepcosmos/remove-autoload-pathRafael Mendonça França2015-03-101-16/+16
|\ \ \
| * | | remove unnecessary path parameterskeepcosmos2015-03-101-16/+16
* | | | Merge pull request #19273 from Gaurav2728/gaurav-remove_test_after_commit_gem...Arthur Nogueira Neves2015-03-101-5/+3
|\ \ \ \ | |/ / / |/| | |
| * | | ‘test_after_commit’ gem is not required in Rails 5 remove note from docGaurav Sharam2015-03-101-5/+3
|/ / /
* | | Merge pull request #19270 from AndrewHendrie/masterZachary Scott2015-03-091-1/+1
|\ \ \
| * | | Changed 'blank space' to 'blank line'Andrew Hendrie2015-03-091-1/+1
|/ / /
* | | Fix intermittent test failuresSean Griffin2015-03-091-0/+1
* | | Call super last in before_setupeileencodes2015-03-092-1/+13
* | | Revert "Revert integration test refactoring that caused app test regressions"eileencodes2015-03-092-18/+10
* | | Merge pull request #19243 from yui-knk/fix/requireRafael Mendonça França2015-03-092-1/+1
|\ \ \
| * | | Fix place of require 'rails_guides/markdown'yui-knk2015-03-072-1/+1
* | | | Fix intermittent test failuresSean Griffin2015-03-091-0/+1
* | | | Merge pull request #19264 from y-yagi/plugins_guideArthur Nogueira Neves2015-03-091-3/+3
|\ \ \ \
| * | | | use public Module#include instead of send :include [ci skip]yuuji.yaginuma2015-03-091-3/+3
* | | | | Revert "Take DST into account when locating TimeZone from Numeric."Andrew White2015-03-093-24/+1
|/ / / /
* | | | Merge pull request #19263 from splattael/target-2.2.1Yves Senn2015-03-099-9/+9
|\ \ \ \
| * | | | Target Ruby 2.2.1 in gemspecsPeter Suschlik2015-03-099-9/+9
|/ / / /
* | | | Merge pull request #19257 from jvanbaarsen/patch-1Eileen M. Uchitelle2015-03-081-1/+1
|\ \ \ \
| * | | | Rails 5.0 needs ruby 2.2.1 or higherJeroen van Baarsen2015-03-081-1/+1
|/ / / /
* | | | Merge pull request #18200 from brainopia/rollback_frozen_recordsArthur Nogueira Neves2015-03-072-1/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix transaction state for unsynced records when entering transactionbrainopia2015-03-042-0/+10
| * | | Fix rollback of frozen recordsbrainopia2015-03-042-1/+11
* | | | Merge pull request #19247 from wazery/doc_fixEileen M. Uchitelle2015-03-074-4/+4
|\ \ \ \
| * | | | Doc fixes [ci skip]Islam Wazery2015-03-074-4/+4
|/ / / /
* | | | Merge pull request #19246 from wazery/patch-1Robin Dupret2015-03-071-7/+7
|\ \ \ \
| * | | | Doc fix [ci skip]Islam Wazery2015-03-071-7/+7
|/ / / /
* | | | Merge pull request #19242 from y-yagi/integration_test_exampleKasper Timm Hansen2015-03-071-7/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | update integration test example as is not output deprecation warning [ci skip]yuuji.yaginuma2015-03-071-7/+8
|/ / /
* | | Merge pull request #19241 from yui-knk/fix/commentRichard Schneeman2015-03-061-2/+2
|\ \ \
| * | | [ci skip] Fix `AS` and `AR` to full nameyui-knk2015-03-071-2/+2
|/ / /
* | | Merge pull request #19234 from sivsushruth/doc_fixKasper Timm Hansen2015-03-071-1/+1
|\ \ \
| * | | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-071-1/+1
* | | | Merge pull request #19231 from prathamesh-sonpatki/fix-url-for-documentationGuillermo Iguaran2015-03-061-1/+4
|\ \ \ \