aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Fix documentation of url_for module [ci skip]Prathamesh Sonpatki2015-03-061-1/+4
* | | | Merge pull request #19233 from sivsushruth/doc_fixAbdelkader Boudih2015-03-061-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-061-1/+1
* | | | Fix leaky `only: …` option for Active Job assertionsJeremy Kemper2015-03-062-9/+23
* | | | Merge pull request #19230 from prathamesh-sonpatki/fix-clear-docRobin Dupret2015-03-061-0/+3
|\ \ \ \
| * | | | Updated documentation of CollectionProxy#clear [ci skip]Prathamesh Sonpatki2015-03-061-0/+3
| | |/ / | |/| |
* | | | Merge pull request #19221 from matthewd/random-testsMatthew Draper2015-03-0610-37/+4
|\ \ \ \
| * | | | Revert "For now, we will keep sorting the tests."Matthew Draper2015-03-064-7/+4
| * | | | Revert "Leave all our tests as order_dependent! for now"Matthew Draper2015-03-066-30/+0
* | | | | tests, sequences are derived from the base class.Yves Senn2015-03-061-7/+10
* | | | | Revert ":cut: remove unnecessary rescue Exceptions"Yves Senn2015-03-063-3/+3
* | | | | replace `repair_validations` with a disposable subclass.Yves Senn2015-03-061-32/+33
* | | | | Remove a duplicated changelog entry [ci skip]Robin Dupret2015-03-061-7/+0
| |/ / / |/| | |
* | | | tests, remove side effects on `Joke` during `base_test.rb`.Yves Senn2015-03-061-23/+28
* | | | Merge pull request #19225 from cristianbica/integration-testsYves Senn2015-03-064-3/+9
|\ \ \ \
| * | | | Fixed ActiveJob integration testsCristian Bica2015-03-054-3/+9
* | | | | put the changelog entry in the right file :sweat: [ci skip]Yves Senn2015-03-061-0/+7
* | | | | `number_to_percentage` and `precision: 0` work with `NAN` and `INFINITY`.Yves Senn2015-03-064-1/+16
* | | | | Merge pull request #19224 from davydovanton/doc-update-seconds-since-midnightAbdelkader Boudih2015-03-061-1/+5
|\ \ \ \ \
| * | | | | [ci skip] Update documentation for Time#seconds_since_midnightAnton Davydov2015-03-061-1/+5
| |/ / / /
* | | | | Change *args to arg in CallbackSequence#calleileencodes2015-03-051-7/+7
* | | | | don't need to rescue Exception in this caseAaron Patterson2015-03-052-1/+7
* | | | | :cut: remove unnecessary rescue ExceptionsAaron Patterson2015-03-053-3/+3
* | | | | remove unnecessary rescueAaron Patterson2015-03-051-2/+0
|/ / / /
* | | | pass a config to the route setAaron Patterson2015-03-055-12/+43
* | | | Merge pull request #19222 from davydovanton/doc-delete-excess-whiteArthur Nogueira Neves2015-03-051-1/+1
|\ \ \ \
| * | | | [ci skip] Delete excess white in documentationAnton Davydov2015-03-051-1/+1
|/ / / /
* | | | Revert "Allow failures with Active Job"Jeremy Kemper2015-03-051-4/+1
* | | | Merge pull request #19220 from davydovanton/doc-add-info-about-sanitize-to-hi...Kasper Timm Hansen2015-03-051-1/+6
|\ \ \ \
| * | | | [ci skip] Add information about sanitize option in TextHelper#highlightAnton Davydov2015-03-051-1/+6
* | | | | Use ruby 2.2.1 on TravisSean Griffin2015-03-051-1/+1
| |/ / / |/| | |
* | | | Merge pull request #19215 from gsamokovarov/revert-ruby-2-2-0-kwarg-crash-wor...Sean Griffin2015-03-053-7/+5
|\ \ \ \
| * | | | Revert work arounds for upstream Ruby 2.2.0 kwargs bugGenadi Samokovarov2015-03-053-7/+5
* | | | | Merge pull request #19218 from sivsushruth/doc_fixKasper Timm Hansen2015-03-051-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |