aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | Merge pull request #1 from charliesome/patch-1David Heinemeier Hansson2014-05-181-9/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Clean up JobWrappers::ResqueWrapper.performCharlie Somerville2014-05-191-9/+3
| | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Queue naming with a base, which requires a JobWrapper to comply to Resques ex...David Heinemeier Hansson2014-05-185-5/+64
| | | * | | | | | | | | | | | | | Add ResqueAdapter and provide test infrastructure for the now multiple adaptersDavid Heinemeier Hansson2014-05-189-10/+76
| | | * | | | | | | | | | | | | | Rename to InlineAdapter to match *Adapter form, even if the queue is embedded...David Heinemeier Hansson2014-05-181-0/+11
| | | * | | | | | | | | | | | | | Simplest job and inline queueDavid Heinemeier Hansson2014-05-184-2/+37
| | | * | | | | | | | | | | | | | Run tests through RakeDavid Heinemeier Hansson2014-05-181-0/+27
| | | * | | | | | | | | | | | | | Skeleton gemDavid Heinemeier Hansson2014-05-1812-0/+184
| | | / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #16532 from gsamokovarov/lock-web-console-for-4.2.0.beta1David Heinemeier Hansson2014-08-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Lock web-console to 2.0.0.beta1 for the first 4.2 betaGenadi Samokovarov2014-08-181-1/+1
| |/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / Dont encourage people to run without autoflush in productionDavid Heinemeier Hansson2014-08-171-3/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-1740-1333/+428
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use AS::JSON for (de)serializing cookiesGodfrey Chan2014-08-173-2/+50
| * | | | | | | | | | | | | | | Preload UnicodeDatabase outside the loopAkira Matsuda2014-08-181-0/+1
| * | | | | | | | | | | | | | | formatAkira Matsuda2014-08-181-2/+1
| * | | | | | | | | | | | | | | `responders` 1.x won't do it. Told you to RTFM for details!Godfrey Chan2014-08-172-3/+8
| * | | | | | | | | | | | | | | Merge pull request #16458 from chancancode/ar_fix_reserved_inheritanceGodfrey Chan2014-08-173-5/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed issue w/custom accessors + reserved name + inheritanceGodfrey Chan2014-08-113-5/+34
| * | | | | | | | | | | | | | | | The gem is called 'responders'Godfrey Chan2014-08-172-4/+4
| * | | | | | | | | | | | | | | | Raise a more helpful error for people who are using these extracted featuresGodfrey Chan2014-08-172-1/+46
| * | | | | | | | | | | | | | | | Fixed broken reference caused by 14965baGodfrey Chan2014-08-171-2/+2
| * | | | | | | | | | | | | | | | Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-175-5/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Add config option for cookies digestŁukasz Strzałkowski2014-08-125-5/+68
| | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #16484 from strzalek/remove-redundant-null-serializerGodfrey Chan2014-08-171-16/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Remove redundant NullSerializerŁukasz Strzałkowski2014-08-131-16/+7
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #16526 from rails/jv-no-respondersJosé Valim2014-08-1714-1276/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Remove more references to respond_withJosé Valim2014-08-179-8/+7
| | * | | | | | | | | | | | | | | | Remove usafe of respond_to in ActionView testsJosé Valim2014-08-171-3/+1
| | * | | | | | | | | | | | | | | | Move respond_with to the responders gemJosé Valim2014-08-174-1265/+8
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #16529 from y-yagi/patch-1Zachary Scott2014-08-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | [ci skip] Fix sample code in Layouts and Rendering guideyuuji.yaginuma2014-08-171-1/+1
| | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow usage of bundle local config for rack by specifying the branchCarlos Antonio da Silva2014-08-171-1/+1
| * | | | | | | | | | | | | | | | Merge pull request #16338 from robin850/rbx-safe-constantizeMatthew Draper2014-08-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Avoid relying on error messages when rescuingRobin Dupret2014-08-081-2/+2
| * | | | | | | | | | | | | | | | | Merge pull request #16527 from jeremy/etag_with_template_digestJeremy Kemper2014-08-177-9/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | When your templates change, browser caches bust automatically.Jeremy Kemper2014-08-177-9/+136
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #16189 from sgrif/sg-attribute-was-in-placeGodfrey Chan2014-08-169-20/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Don't expose these new APIs yet (added in 877ea78 / #16189)Godfrey Chan2014-08-163-15/+21
| | * | | | | | | | | | | | | | | | Implement `_was` and `changes` for in-place mutations of AR attributesSean Griffin2014-08-168-21/+62
| |/ / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / Fix rounding errors with #travel_to by resetting the usec on any passed time ...David Heinemeier Hansson2014-08-173-4/+20
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #16517 from sgrif/sg-comparable-attributesRafael Mendonça França2014-08-164-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Implement `==` on `Type::Value` and `Attribute`Sean Griffin2014-08-154-0/+50
* | | | | | | | | | | | | | | | | Merge pull request #16523 from tomkadwill/cookie_store_rewordingRafael Mendonça França2014-08-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | [ci skip] re-worded section on CookieStore to make it more readable.Tom Kadwill2014-08-161-3/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Avoid mutating the constants in a test caseAkira Matsuda2014-08-162-6/+4
* | | | | | | | | | | | | | | | | Avoid polluting String class globally in a test caseAkira Matsuda2014-08-161-8/+13
* | | | | | | | | | | | | | | | | Unused ivar in a test suiteAkira Matsuda2014-08-161-1/+0
* | | | | | | | | | | | | | | | | Merge pull request #16435 from arthurnn/after_commit_run_on_top_level_trans_m...Godfrey Chan2014-08-154-4/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix regression on after_commit in nested transactions.Arthur Neves2014-08-153-0/+21
| * | | | | | | | | | | | | | | | Use *_transaction methods in TransactionManagerArthur Neves2014-08-152-4/+26
|/ / / / / / / / / / / / / / / /