Commit message (Collapse) | 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 | ||||
| * | 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 |
|\ \ | | | | | | | Outdated information about session storage updated [ci skip] | ||||
| * | | [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 |
| | | | | | | | | | | | | The guide contains information about Rails 2 storing mechanism, but not Rails 4. Enhanced the accuracy and coherence of information (There was a part saying "Older versions of Rails use CookieStore, which uses `secret_token` instead of `secret_key_base` that is used by EncryptedCookieStore." while there was no mention of EncryptedCookieStore before) | ||||
* | | | :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 | ||||
| * | | | 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 |
|/ / / | | | | | | | | | | | | | There are some cases where :path is nil on option and we should respect that. | ||||
* | | | try to pass fewer options to `scope` | Aaron Patterson | 2015-08-10 | 1 | -2/+3 |
| | | | | | | | | | | | | We already know how to handle `path`, so lets just handle it on our own. | ||||
* | | | always cast `name` to a symbol, and never to_s it | Aaron Patterson | 2015-08-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | All callers of `action_path` interpolate the return value in to a string, so there is no need for the method to to_s it. to_sym on a symbol will return the same symbol, though I think `action_path` may always be called with a symbol so this might not be necessary. | ||||
* | | | pull path conditional up | Aaron Patterson | 2015-08-10 | 1 | -4/+6 |
| | | | | | | | | | | | | we only need to check for `path` once. | ||||
* | | | 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 | ||||
| * | | | [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 | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Now we can see where `defaults` options originate | ||||
* | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | since `controller` and `controller_scope` were the same, just combine them | ||||
* | | | | | remove another call to `scope` | Aaron Patterson | 2015-08-10 | 1 | -3/+4 |
|/ / / / | |||||
* | | | | remove dead code | Aaron Patterson | 2015-08-10 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | This method isn't used internally, isn't tested, isn't documented. We should delete it. | ||||
* | | | | avoid is_a? calls | Aaron Patterson | 2015-08-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | add a predicate method so that we can avoid is_a? calls on the resource object. | ||||
* | | | | avoid another call to `scope` | Aaron Patterson | 2015-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | calling `scope` isn't cheap, so try to call cheaper methods that do the same thing for those particular parameters (in this case `path_scope`) | ||||
* | | | | push `with_scope_level` up so resource_scope doesn't know | Aaron Patterson | 2015-08-10 | 1 | -25/+27 |
| | | | | | | | | | | | | | | | | | | | | `resource_scope` should just put resource scopes on the stack, and doesn't need to know what a `scope_level` is. | ||||
* | | | | reuse the same frame so we don't need a singleton hash | Aaron Patterson | 2015-08-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | We just want to augment the scope level, not the frame itself, so just copy the frame to the new scope object. | ||||
* | | | | [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] | ||||
| * | | | | Update info on browser connection limits [ci skip] | Derek Prior | 2015-08-10 | 1 | -11/+18 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Browsers have not been limited to two connections per host for quite some time now. With more connections allowed, the trade-off involved in asset host distribution isn't so clear and it becomes more important that developers measure actual performance before and after. | ||||
* | | | | add a null node at the top of the stack | Aaron Patterson | 2015-08-10 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | this gives us an easier way to iterate the stack | ||||
* | | | | remove `@nesting` ivar | Aaron Patterson | 2015-08-10 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | | | | | The same information is stored in the `@scope` linked list, so just get it from there. | ||||
* | | | | pass `shallow` in to the resource constructor | Aaron Patterson | 2015-08-10 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | this lets us remove the setter and make the Resource object Read-Only | ||||
* | | | | we have the resource on the stack, so just use it | Aaron Patterson | 2015-08-10 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | We don't need to ask `scope` for the resource because we already have it right here. | ||||
* | | | Merge pull request #21183 from brooksreese/ar_overview_change | Abdelkader Boudih | 2015-08-10 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | [ci skip] Modify introduction to be consistent with other guides | ||||
| * | | | [ci skip] Modify introduction text and bullets to be consistent with other ↵ | Brooks Reese | 2015-08-10 | 1 | -5/+5 |
|/ / / | | | | | | | | | | guides | ||||
* | | | docs, use hash instead of a string for `order`. [ci skip] | Yves Senn | 2015-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #21121 | ||||
* | | | Merge pull request #21124 from kirs/feature/reload-i18n | Kasper Timm Hansen | 2015-08-10 | 5 | -3/+114 |
|\ \ \ | | | | | | | | | Reload I18n.load_path in development | ||||
| * | | | 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 | ||||
| * | | | | make generated scaffold functional tests work inside API engines | yuuji.yaginuma | 2015-08-09 | 2 | -1/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * set engine's route in setup * use fixture with engine namespace | ||||
* | | | | | Remove wrong comment | Rafael Mendonça França | 2015-08-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This method raises conditionally not always so we should not documment as it always raise. | ||||
* | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We should return when the contoller key is not present or if the controller doesn't exist and we didn't raised an error. | ||||
* | | | | | Name the argument according with its job | Rafael Mendonça França | 2015-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Related with dc1b937db780155089fce522f03d340e62f5df36 | ||||
* | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eliminates calling `scope` in one method, pushes the other calls up one frame. This goes a little way towards eliminating the internal calls to `scope`. | ||||
* | | | | | 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 | ||||
| * | | | | [ci skip] Note that each action maps to a specific CRUD operation | Brooks Reese | 2015-08-09 | 1 | -1/+3 |
| | | | | |