aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make assert_enqueued_with and assert_performed_with returns the matched jobJean Boussier2015-08-103-2/+38
* remove dead codeAaron Patterson2015-08-101-12/+0
* avoid is_a? callsAaron Patterson2015-08-101-1/+5
* avoid another call to `scope`Aaron Patterson2015-08-101-1/+1
* push `with_scope_level` up so resource_scope doesn't knowAaron Patterson2015-08-101-25/+27
* reuse the same frame so we don't need a singleton hashAaron Patterson2015-08-101-2/+1
* [ci skip] Fix simultaneous spellingKasper Timm Hansen2015-08-101-1/+1
* Merge pull request #21188 from derekprior/dp-asset-host-docsRafael Mendonça França2015-08-101-11/+18
|\
| * Update info on browser connection limits [ci skip]Derek Prior2015-08-101-11/+18
* | add a null node at the top of the stackAaron Patterson2015-08-101-13/+9
* | remove `@nesting` ivarAaron Patterson2015-08-101-9/+21
* | pass `shallow` in to the resource constructorAaron Patterson2015-08-101-10/+5
* | we have the resource on the stack, so just use itAaron Patterson2015-08-101-1/+1
|/
* Merge pull request #21183 from brooksreese/ar_overview_changeAbdelkader Boudih2015-08-101-5/+5
|\
| * [ci skip] Modify introduction text and bullets to be consistent with other gu...Brooks Reese2015-08-101-5/+5
|/
* docs, use hash instead of a string for `order`. [ci skip]Yves Senn2015-08-101-1/+1
* Merge pull request #21124 from kirs/feature/reload-i18nKasper Timm Hansen2015-08-105-3/+114
|\
| * Reload I18n locales in developmentKir Shatrov2015-08-105-3/+114
* | Update Gemfile.lockRafael Mendonça França2015-08-101-53/+48
* | Merge pull request #21176 from y-yagi/fix_scaffold_tests_inside_api_engineRafael Mendonça França2015-08-092-1/+32
|\ \
| * | make generated scaffold functional tests work inside API enginesyuuji.yaginuma2015-08-092-1/+32
* | | Remove wrong commentRafael Mendonça França2015-08-091-1/+0
* | | Remove the conditional since it is done in the methodRafael Mendonça França2015-08-091-4/+4
* | | Execute the block when the controller doesn't existRafael Mendonça França2015-08-091-0/+1
* | | Name the argument according with its jobRafael Mendonça França2015-08-091-2/+2
* | | WhitespacesRafael Mendonça França2015-08-091-1/+1
* | | push `scope` calls up one frameAaron Patterson2015-08-091-5/+13
* | | Merge pull request #21177 from brooksreese/single_crud_operationClaudio B.2015-08-091-1/+3
|\ \ \ | |/ / |/| |
| * | [ci skip] Note that each action maps to a specific CRUD operationBrooks Reese2015-08-091-1/+3
* | | remove useless hashAaron Patterson2015-08-081-2/+2
* | | stop calling `scope` internallyAaron Patterson2015-08-082-13/+24
* | | remove useless conditionalAaron Patterson2015-08-081-1/+1
* | | eliminate assignment in conditionalAaron Patterson2015-08-081-1/+3
* | | Remove `defaults` hash from `Dispatcher`Aaron Patterson2015-08-082-9/+9
* | | eliminate runtime conditionalAaron Patterson2015-08-081-10/+9
* | | whitespaceAaron Patterson2015-08-081-3/+3
* | | remove the setter from `Scope`Aaron Patterson2015-08-081-4/+0
* | | Merge pull request #21175 from gringocl/middleware-deprecationsRichard Schneeman2015-08-081-5/+5
|\ \ \
| * | | Reference actual classesMiles Starkenburg2015-08-081-5/+5
* | | | Merge pull request #21173 from repinel/fix-callback-terminator-docsClaudio B.2015-08-081-3/+3
|\ \ \ \
| * | | | [ci skip] Fix the AS::Callbacks terminator docsRoque Pinel2015-08-081-3/+3
* | | | | Merge pull request #21166 from brooksreese/migration_seed_explanationClaudio B.2015-08-081-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Give in-depth explanation of migrations vs. seeds.rbBrooks Reese2015-08-081-4/+9
| | |/ / | |/| |
* | | | Merge pull request #21174 from melissawahnish/document_gmailRafael Mendonça França2015-08-081-0/+3
|\ \ \ \
| * | | | [ci skip] Adding a note to Action Mailer Basics documentation that Google inc...melissawahnish2015-08-081-0/+3
|/ / / /
* | | | Merge pull request #21167 from AaronLasseigne/use_each_keyKasper Timm Hansen2015-08-082-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | replace each with each_key when only the key is neededAaron Lasseigne2015-08-082-2/+2
* | | | Refactor route assertion methods in resources testeileencodes2015-08-081-50/+51
* | | | Merge pull request #11352 from xaviershay/dispatcher-apiRafael Mendonça França2015-08-084-21/+23
|\ \ \ \
| * | | | Allow a custom dispatcher to be provided to routing.Xavier Shay2015-08-074-19/+17
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 10:43:45 +0000