aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added helper methods to stub any instanceRonak Jangir2015-08-132-1/+18
* Merge pull request #21187 from arthurnn/method_missing_routes_avArthur Nogueira Neves2015-08-111-3/+9
|\
| * Dont try to call method missing in routes if thats not what we wantArthur Neves2015-08-101-3/+9
* | Merge pull request #17885 from starbelly/patch-1Yves Senn2015-08-113-14/+31
|\ \
| * | Add run_cmd class method to ActiveRecord::Tasks::DatabaseTasksstarbelly2015-08-014-17/+39
* | | Tiny documentation fixes [ci skip]Robin Dupret2015-08-113-8/+13
* | | Merge pull request #21165 from manlon/masterRafael Mendonça França2015-08-115-3/+34
|\ \ \
| * | | use correct DB connection for generated HABTM tableMatt Hanlon2015-08-075-3/+34
* | | | Merge pull request #21138 from dhiachou/patch-2Rafael Mendonça França2015-08-111-2/+4
|\ \ \ \
| * | | | [ci skip] Typo fixedDhia Eddine Chouchane2015-08-061-1/+1
| * | | | Outdated information about session storage updated [ci skip] Dhia Eddine Chouchane2015-08-061-2/+4
* | | | | :nodoc: internal class [ci skip]Godfrey Chan2015-08-101-1/+1
* | | | | Merge pull request #21191 from byroot/deprecate-si-prefixRafael Mendonça França2015-08-114-11/+19
|\ \ \ \ \
| * | | | | Deprecate :si prefix in number_to_human_size without replacementJean Boussier2015-08-102-9/+15
| * | | | | Deprecate the :prefix option of `number_to_human_size`Jean Boussier2015-08-102-2/+4
* | | | | | Only use path if the key is not presentRafael Mendonça França2015-08-101-1/+1
|/ / / / /
* | | | | try to pass fewer options to `scope`Aaron Patterson2015-08-101-2/+3
* | | | | always cast `name` to a symbol, and never to_s itAaron Patterson2015-08-101-2/+1
* | | | | pull path conditional upAaron Patterson2015-08-101-4/+6
* | | | | Merge pull request #21184 from brooksreese/touch_on_unit_testingRafael Mendonça França2015-08-101-1/+7
|\ \ \ \ \
| * | | | | [ci skip] Add link to testing guideBrooks Reese2015-08-101-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #21010 from byroot/activejob-test-helpersRafael Mendonça França2015-08-103-2/+38
|\ \ \ \ \
| * | | | | Make assert_enqueued_with and assert_performed_with returns the matched jobJean Boussier2015-08-103-2/+38
* | | | | | pull `defaults` extraction up the stack.Aaron Patterson2015-08-101-2/+6
* | | | | | avoid calling `scope` on `defaults` methodsAaron Patterson2015-08-101-3/+6
* | | | | | let the `controller` method push / pop the stackAaron Patterson2015-08-101-11/+5
* | | | | | remove another call to `scope`Aaron Patterson2015-08-101-3/+4
|/ / / / /
* | | | | 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