| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | Remove extra space assertion | Carlos Antonio da Silva | 2014-03-19 | 1 | -3/+2 |
* | | | | | | Extract common setup for loading tasks in rake notes tests | Carlos Antonio da Silva | 2014-03-19 | 1 | -29/+14 |
|/ / / / / |
|
* | | | | | Merge pull request #14431 from chancancode/warn_about_json_cookie_jars | Guillermo Iguaran | 2014-03-19 | 2 | -0/+48 |
|\ \ \ \ \ |
|
| * | | | | | Added a warning about serializing data with JSON cookie jars [skip ci] | Godfrey Chan | 2014-03-19 | 2 | -0/+48 |
|/ / / / / |
|
* | | | | | Merge pull request #14429 from chriskohlbrenner/fix_typo_ar_querying_guide | Arthur Nogueira Neves | 2014-03-19 | 1 | -1/+1 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Fix a typo to make clause plural [ci skip] | chriskohlbrenner | 2014-03-19 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge pull request #14421 from davidpdrsn/reorder-conditionals | Rafael Mendonça França | 2014-03-18 | 1 | -10/+10 |
|\ \ \ \ |
|
| * | | | | Reorder conditional logic | David Pedersen | 2014-03-18 | 1 | -10/+10 |
|/ / / / |
|
* | | | | Merge pull request #14413 from arthurnn/port_test_cc | Godfrey Chan | 2014-03-18 | 1 | -0/+11 |
|\ \ \ \ |
|
| * | | | | Add counter cache test for class_name | Arthur Neves | 2014-03-17 | 1 | -0/+11 |
|/ / / / |
|
* | | | | test should only pass if the pool.size+1 checkout fails | Aaron Patterson | 2014-03-17 | 1 | -3/+2 |
* | | | | use a latch to avoid busy loops | Aaron Patterson | 2014-03-17 | 1 | -3/+4 |
* | | | | Merge pull request #14360 from matthewd/thread_aware_reaper | Aaron Patterson | 2014-03-17 | 8 | -69/+103 |
|\ \ \ \ |
|
| * | | | | Reap connections based on owning-thread death | Matthew Draper | 2014-03-18 | 7 | -68/+66 |
| * | | | | Teach PostgreSQLAdapter#reset! to actually reset | Matthew Draper | 2014-03-18 | 2 | -1/+37 |
|/ / / / |
|
* | | | | Merge pull request #14379 from robertomiranda/rake-notes.config | Guillermo Iguaran | 2014-03-17 | 6 | -30/+81 |
|\ \ \ \ |
|
| * | | | | Rake notes should picked up new Extensions registered in the config/applicati... | robertomiranda | 2014-03-17 | 1 | -3/+19 |
| * | | | | Update command line guide | robertomiranda | 2014-03-17 | 1 | -1/+7 |
| * | | | | Add Changelog Entry ref #14379 | robertomiranda | 2014-03-17 | 1 | -0/+8 |
| * | | | | Add config.annotations, in order to register new extensions for Rake notes at... | robertomiranda | 2014-03-16 | 2 | -0/+14 |
| * | | | | Fix Shadowing extensions variable in Register Annotation Exentsions | robertomiranda | 2014-03-16 | 2 | -7/+7 |
| * | | | | Supporting .ruby, .yml and .yaml Extension in Rake Notes | robertomiranda | 2014-03-14 | 2 | -2/+7 |
| * | | | | Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we have... | robertomiranda | 2014-03-14 | 2 | -17/+5 |
| * | | | | Add Public Api for register new extensions for Rake Notes | robertomiranda | 2014-03-14 | 2 | -15/+29 |
* | | | | | Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if... | Aaron Patterson | 2014-03-17 | 2 | -10/+30 |
|\ \ \ \ \ |
|
| * | | | | | re-raise error if error occurs before committing in streaming | Kevin Casey | 2014-03-14 | 2 | -10/+30 |
| | |/ / /
| |/| | | |
|
* | | | | | `where.not` adds `references` for `includes`. | Yves Senn | 2014-03-17 | 4 | -0/+26 |
* | | | | | fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`. | Yves Senn | 2014-03-17 | 4 | -2/+14 |
* | | | | | format ActiveRecord CHANGELOG. [ci skip] | Yves Senn | 2014-03-17 | 1 | -8/+9 |
* | | | | | Fix assertions | Carlos Antonio da Silva | 2014-03-16 | 1 | -2/+2 |
* | | | | | Add an explicit require for 4ece124396669d3580e7f229ab407a0d4882727a rather t... | Jeremy Kemper | 2014-03-16 | 1 | -0/+1 |
* | | | | | Avoid concurrent test collision on the same memcache server by namespacing keys | Jeremy Kemper | 2014-03-16 | 1 | -1/+1 |
* | | | | | Use nested_scope? not shallow? to determine whether to copy options | Andrew White | 2014-03-16 | 3 | -1/+49 |
* | | | | | Remove extra white-spaces [ci skip] | Robin Dupret | 2014-03-16 | 1 | -13/+13 |
* | | | | | Let COMMAND_WHITELIST be an Array, not a String | Akira Matsuda | 2014-03-16 | 1 | -1/+1 |
* | | | | | Merge pull request #14399 from genericsteele/fixture-label-string-interpolation | Jeremy Kemper | 2014-03-15 | 4 | -1/+19 |
|\ \ \ \ \ |
|
| * | | | | | Extend fixture label replacement to allow string interpolation | Eric Steele | 2014-03-15 | 4 | -1/+19 |
|/ / / / / |
|
* | | | | | Merge pull request #14396 from afshinator/master | Jeremy Kemper | 2014-03-15 | 1 | -11/+28 |
|\ \ \ \ \ |
|
| * | | | | | Reword 5.6 strong parameters and private method stuff [ci skip] | Afshin Mokhtari | 2014-03-15 | 1 | -11/+28 |
* | | | | | | Merge pull request #14395 from arthurnn/fix_mailer_preview_test | Jeremy Kemper | 2014-03-15 | 1 | -4/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | Fix MailerPreview broken tests | Arthur Neves | 2014-03-15 | 1 | -4/+4 |
* | | | | | | | Merge pull request #12662 from nashby/include-hidden-collection | Rafael Mendonça França | 2014-03-15 | 3 | -3/+18 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | add include_hidden option to collection_check_boxes helper | Vasiliy Ermolovich | 2013-10-27 | 3 | -4/+19 |
* | | | | | | | Merge pull request #14394 from zoltankiss/fix_typo | Arthur Neves | 2014-03-15 | 1 | -2/+1 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Minor grammer, code conventions fix [ci skip] | Zoltan Kiss | 2014-03-15 | 1 | -2/+1 |
|/ / / / / / / |
|
* | | | | | | | Clarify AV::Digestor.digest method signature docs and deprecation warning | Jeremy Kemper | 2014-03-15 | 2 | -24/+23 |
* | | | | | | | Remove deprecation on active_support/core_ext/class/attribute_accessors requi... | Jeremy Kemper | 2014-03-15 | 1 | -5/+3 |
* | | | | | | | Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activer... | Yves Senn | 2014-03-15 | 49 | -61/+51 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Use teardown helper method. | Guo Xiang Tan | 2014-03-14 | 49 | -61/+51 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Obey `validate: false` option for habtm | Carlos Antonio da Silva | 2014-03-14 | 4 | -1/+39 |