Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #19138 from yui-knk/fix/code_block_lang | Abdelkader Boudih | 2015-03-01 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Fix fenced code block lang | |||||
| * | | | | | [ci skip] Fix fenced code block lang | yui-knk | 2015-03-01 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19137 from kant/patch-2 | Abdelkader Boudih | 2015-03-01 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Update link (minor fix) | |||||
| * | | | | | Update link (minor fix) | Darío Hereñú | 2015-02-28 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19136 from kant/patch-1 | Abdelkader Boudih | 2015-03-01 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Minor fixes (proposal) | |||||
| * | | | | | Minor fixes (proposal) | Darío Hereñú | 2015-02-28 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | / / | drop allocations when handling model url generation | Aaron Patterson | 2015-02-28 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #19131 from ↵ | Yves Senn | 2015-02-28 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | tgxworld/reduce_allocated_memory_in_module_delegate Reduce allocated memory for Module#delegate. | |||||
| * | | | | Reduce allocated memory for Module#delegate. | Guo Xiang Tan | 2015-03-01 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #19132 from davydovanton/pdate-doc-module-anonymous | Rafael Mendonça França | 2015-02-28 | 1 | -0/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Add code examples for Module#anonymous? documentation | |||||
| * | | | | | [ci skip] Add code examples for Module#anonymous? documentation | Anton Davydov | 2015-02-28 | 1 | -0/+7 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19130 from yui-knk/fix/active_support_core_extensions2 | Yves Senn | 2015-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ci skip] Fix to comment | |||||
| * | | | | | | [ci skip] Fix to comment | yui-knk | 2015-03-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #19129 from yui-knk/fix/active_support_core_extensions | Yves Senn | 2015-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | [ci skip] Fix to String | |||||
| * | | | | | | [ci skip] Fix to String | yui-knk | 2015-03-01 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #19128 from davydovanton/update-doc-range-to-s | Kasper Timm Hansen | 2015-02-28 | 1 | -2/+17 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ci skip] Update documentation for Range#to_formatted_s | |||||
| * | | | | | | [ci skip] Update documentation for Range#to_formatted_s | Anton Davydov | 2015-02-28 | 1 | -2/+17 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #18965 from hjoo/rake_restart | Eileen M. Uchitelle | 2015-02-28 | 4 | -0/+43 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | created rake restart task | |||||
| * | | | | | Created rake restart task. | Hyonjee Joo | 2015-02-26 | 4 | -0/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18876. Rake restart touches `tmp/restart.txt` to restart application on next request. Updated tests and documentation accordingly. | |||||
* | | | | | | Merge pull request #19125 from y-yagi/testing_guide | Yves Senn | 2015-02-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | add `ActiveJob::TestCase` to list of classes providing for test [ci skip] | |||||
| * | | | | | add `ActiveJob::TestCase` to list of classes providing for test [ci skip] | yuuji.yaginuma | 2015-02-28 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19123 from yui-knk/fix/active_support_instrumentation2 | Guillermo Iguaran | 2015-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip] Remove `,` | |||||
| * | | | | | [ci skip] Remove `,` | yui-knk | 2015-02-28 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19124 from davydovanton/add-doc-for-is-utf8 | Guillermo Iguaran | 2015-02-28 | 1 | -0/+7 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [skip ci] Add documentation for String#is_utf8? method | |||||
| * | | | | | | [skip ci] Add documentation for String#is_utf8? method | Anton Davydov | 2015-02-28 | 1 | -0/+7 | |
| | | | | | | | ||||||
* | | | | | | | Spell PostgreSQL correctly :elephant: | Akira Matsuda | 2015-02-28 | 2 | -2/+2 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | Merge pull request #19122 from yui-knk/fix/active_support_instrumentation | Abdelkader Boudih | 2015-02-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip] Replace `ActiveResource` with `Active Resource` | |||||
| * | | | | | [ci skip] Replace `ActiveResource` with `Active Resource` | yui-knk | 2015-02-28 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19121 from davydovanton/update-doc-for-remove | Yves Senn | 2015-02-28 | 1 | -2/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update documentation examples for String#remove [skip ci] | |||||
| * | | | | | Update documentation examples for String#remove [skip ci] | Anton Davydov | 2015-02-28 | 1 | -6/+7 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #19120 from yui-knk/fix/md_table | Abdelkader Boudih | 2015-02-28 | 1 | -9/+9 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip] Fix table of 4_1_release_notes.md | |||||
| * | | | | | [ci skip] Fix table of 4_1_release_notes.md | yui-knk | 2015-02-28 | 1 | -9/+9 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19114 from richardvenneman/i18n-guide-update | Kasper Timm Hansen | 2015-02-27 | 1 | -5/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove reference to workingwithrails.com since it is being retired | |||||
| * | | | | | Remove reference to workingwithrails.com since it is being retired | Richard Venneman | 2015-02-27 | 1 | -5/+2 | |
|/ / / / / | ||||||
* | | | | | Add changelog for #15549 fix [skip ci] | Arthur Neves | 2015-02-27 | 1 | -0/+7 | |
| | | | | | ||||||
* | | | | | Merge pull request #19113 from vipulnsward/remove-requires | Rafael Mendonça França | 2015-02-27 | 4 | -5/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Removed non-standard and unused require 'active_support/deprecation' | |||||
| * | | | | | Removed non-standard and unused require 'active_support/deprecation' from ↵ | Vipul A M | 2015-02-27 | 4 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | parts out of active_support. | |||||
* | | | | | | Don't recommend to precompile all assets | Rafael Mendonça França | 2015-02-27 | 1 | -21/+0 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is very slow since it will precompile even plugins. Also it is very unlikely that any application will use this patterns since it is not a good practice to include all assets manually in the page. [ci skip] | |||||
* | | | | | Merge pull request #19111 from icem/patch-1 | Xavier Noria | 2015-02-27 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Guides mistake about page caching. | |||||
| * | | | | | Guides mistake about page caching. | Yury Otcheski | 2015-02-27 | 1 | -1/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | DHH's key-based cache expiration isn't alternative to page caching. It's true about action caching but not page caching. I propose to remove this line as confusing, page caching is still best if applicable. [ci skip] | |||||
* | | | | | Merge pull request #19102 from ulissesalmeida/fix-regression-default-translation | Rafael Mendonça França | 2015-02-27 | 3 | -1/+15 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix regression when passing a value different of String. | |||||
| * | | | | | Fix regression when passing a value different of String. | Ulisses Almeida | 2015-02-26 | 3 | -1/+15 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of rails(4.2.0) you can pass objects to the default option of translation helper. For example: ```ruby t('foo', default: 1) ``` But on rails 4.2.1 version this kind of use stopped to work, because started only to accept String types. Now with this fix we can use orther value types on this helper again. | |||||
* | | | | | Merge pull request #19110 from aditya-kapoor/fix-val-doc | Rafael Mendonça França | 2015-02-27 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | [ci-skip] correct doc about custom validators | |||||
| * | | | | | [ci-skip] correct doc about custom validators | Aditya Kapoor | 2015-02-27 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19104 from y-yagi/fix_skip_filter | Carlos Antonio da Silva | 2015-02-27 | 2 | -1/+9 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix NameError in `skip_filter`. callback doesn't exist. | |||||
| * | | | | | fix NameError in `skip_filter`. callback doesn't exist. | yuuji.yaginuma | 2015-02-27 | 2 | -1/+9 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #19107 from prathamesh-sonpatki/template-inheritance | Abdelkader Boudih | 2015-02-27 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix wording in template inheritance section of layout guide [ci skip] | |||||
| * | | | | Fix wording in template inheritance section of layout guide [ci skip] | Prathamesh Sonpatki | 2015-02-27 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Revert integration test refactoring that caused app test regressions | Jeremy Kemper | 2015-02-26 | 2 | -10/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Haven't diagnosed yet. No similarly failing tests in Rails to work from. cc @tenderlove, @eileencodes Revert "there is always an integration session, so remove the check" Revert "lazily create the integration session" Revert "use before_setup to set up test instance variables" This reverts commits 4cf3b8ac47f109fa83a6f66eb97d6cb0eace0d05, 303567e554de26822f3107be55c471d6477a745f, and fa63448420d3385dbd043aca22dba973b45b8bb2. | |||||
* | | | | | Revert "Merge pull request #18764 from tsun1215/master" | Jeremy Kemper | 2015-02-26 | 2 | -5/+5 | |
| |/ / / |/| | | | | | | | | | | | | | | | This reverts commit b6dd0c4ddebf5e7aab0a669915cb349ec65e5b88, reversing changes made to de9a3748c436f849dd1877851115cd94663c2725. |