Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Tiny documentation fixes [ci skip] | Robin Dupret | 2015-08-11 | 3 | -8/+13 | |
* | | | | | Merge pull request #21165 from manlon/master | Rafael Mendonça França | 2015-08-11 | 5 | -3/+34 | |
|\ \ \ \ \ | ||||||
| * | | | | | use correct DB connection for generated HABTM table | Matt Hanlon | 2015-08-07 | 5 | -3/+34 | |
* | | | | | | Merge pull request #21138 from dhiachou/patch-2 | Rafael Mendonça França | 2015-08-11 | 1 | -2/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] Typo fixed | Dhia Eddine Chouchane | 2015-08-06 | 1 | -1/+1 | |
| * | | | | | | Outdated information about session storage updated [ci skip] | Dhia Eddine Chouchane | 2015-08-06 | 1 | -2/+4 | |
* | | | | | | | :nodoc: internal class [ci skip] | Godfrey Chan | 2015-08-10 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #21191 from byroot/deprecate-si-prefix | Rafael Mendonça França | 2015-08-11 | 4 | -11/+19 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Deprecate :si prefix in number_to_human_size without replacement | Jean Boussier | 2015-08-10 | 2 | -9/+15 | |
| * | | | | | | Deprecate the :prefix option of `number_to_human_size` | Jean Boussier | 2015-08-10 | 2 | -2/+4 | |
* | | | | | | | Only use path if the key is not present | Rafael Mendonça França | 2015-08-10 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | try to pass fewer options to `scope` | Aaron Patterson | 2015-08-10 | 1 | -2/+3 | |
* | | | | | | always cast `name` to a symbol, and never to_s it | Aaron Patterson | 2015-08-10 | 1 | -2/+1 | |
* | | | | | | pull path conditional up | Aaron Patterson | 2015-08-10 | 1 | -4/+6 | |
* | | | | | | Merge pull request #21184 from brooksreese/touch_on_unit_testing | Rafael Mendonça França | 2015-08-10 | 1 | -1/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] Add link to testing guide | Brooks Reese | 2015-08-10 | 1 | -1/+7 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #21010 from byroot/activejob-test-helpers | Rafael Mendonça França | 2015-08-10 | 3 | -2/+38 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Make assert_enqueued_with and assert_performed_with returns the matched job | Jean Boussier | 2015-08-10 | 3 | -2/+38 | |
* | | | | | | | pull `defaults` extraction up the stack. | Aaron Patterson | 2015-08-10 | 1 | -2/+6 | |
* | | | | | | | avoid calling `scope` on `defaults` methods | Aaron Patterson | 2015-08-10 | 1 | -3/+6 | |
* | | | | | | | let the `controller` method push / pop the stack | Aaron Patterson | 2015-08-10 | 1 | -11/+5 | |
* | | | | | | | remove another call to `scope` | Aaron Patterson | 2015-08-10 | 1 | -3/+4 | |
|/ / / / / / | ||||||
* | | | | | | remove dead code | Aaron Patterson | 2015-08-10 | 1 | -12/+0 | |
* | | | | | | avoid is_a? calls | Aaron Patterson | 2015-08-10 | 1 | -1/+5 | |
* | | | | | | avoid another call to `scope` | Aaron Patterson | 2015-08-10 | 1 | -1/+1 | |
* | | | | | | push `with_scope_level` up so resource_scope doesn't know | Aaron Patterson | 2015-08-10 | 1 | -25/+27 | |
* | | | | | | reuse the same frame so we don't need a singleton hash | Aaron Patterson | 2015-08-10 | 1 | -2/+1 | |
* | | | | | | [ci skip] Fix simultaneous spelling | Kasper Timm Hansen | 2015-08-10 | 1 | -1/+1 | |
* | | | | | | Merge pull request #21188 from derekprior/dp-asset-host-docs | Rafael Mendonça França | 2015-08-10 | 1 | -11/+18 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update info on browser connection limits [ci skip] | Derek Prior | 2015-08-10 | 1 | -11/+18 | |
| |/ / / / / | ||||||
* | | | | | | add a null node at the top of the stack | Aaron Patterson | 2015-08-10 | 1 | -13/+9 | |
* | | | | | | remove `@nesting` ivar | Aaron Patterson | 2015-08-10 | 1 | -9/+21 | |
* | | | | | | pass `shallow` in to the resource constructor | Aaron Patterson | 2015-08-10 | 1 | -10/+5 | |
* | | | | | | we have the resource on the stack, so just use it | Aaron Patterson | 2015-08-10 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #21183 from brooksreese/ar_overview_change | Abdelkader Boudih | 2015-08-10 | 1 | -5/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | [ci skip] Modify introduction text and bullets to be consistent with other gu... | Brooks Reese | 2015-08-10 | 1 | -5/+5 | |
|/ / / / / | ||||||
* | | | | | docs, use hash instead of a string for `order`. [ci skip] | Yves Senn | 2015-08-10 | 1 | -1/+1 | |
* | | | | | Merge pull request #21124 from kirs/feature/reload-i18n | Kasper Timm Hansen | 2015-08-10 | 5 | -3/+114 | |
|\ \ \ \ \ | ||||||
| * | | | | | Reload I18n locales in development | Kir Shatrov | 2015-08-10 | 5 | -3/+114 | |
* | | | | | | Update Gemfile.lock | Rafael Mendonça França | 2015-08-10 | 1 | -53/+48 | |
* | | | | | | Merge pull request #21176 from y-yagi/fix_scaffold_tests_inside_api_engine | Rafael Mendonça França | 2015-08-09 | 2 | -1/+32 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | make generated scaffold functional tests work inside API engines | yuuji.yaginuma | 2015-08-09 | 2 | -1/+32 | |
* | | | | | | | Remove wrong comment | Rafael Mendonça França | 2015-08-09 | 1 | -1/+0 | |
* | | | | | | | Remove the conditional since it is done in the method | Rafael Mendonça França | 2015-08-09 | 1 | -4/+4 | |
* | | | | | | | Execute the block when the controller doesn't exist | Rafael Mendonça França | 2015-08-09 | 1 | -0/+1 | |
* | | | | | | | Name the argument according with its job | Rafael Mendonça França | 2015-08-09 | 1 | -2/+2 | |
* | | | | | | | Whitespaces | Rafael Mendonça França | 2015-08-09 | 1 | -1/+1 | |
* | | | | | | | push `scope` calls up one frame | Aaron Patterson | 2015-08-09 | 1 | -5/+13 | |
* | | | | | | | Merge pull request #21177 from brooksreese/single_crud_operation | Claudio B. | 2015-08-09 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] Note that each action maps to a specific CRUD operation | Brooks Reese | 2015-08-09 | 1 | -1/+3 |