aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17885 from starbelly/patch-1Yves Senn2015-08-113-14/+31
|\ | | | | | | | | | | | | Add method to run command-line db apps Conflicts: activerecord/CHANGELOG.md
| * Add run_cmd class method to ActiveRecord::Tasks::DatabaseTasksstarbelly2015-08-014-17/+39
| | | | | | | | | | | | | | | | | | | | - Added run_cmd() class method to dry up Kernel.system() messages within this namespace and avoid shell expansion by passing a list of arguments instead of a string - Update structure_dump, structure_load, and related tests units to pass a list of params instead of using a string to avoid shell expansion
* | 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 table
| * | 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
|\ \ \ | | | | | | | | Outdated information about session storage updated [ci skip]
| * | | [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
| | | | | | | | | | | | | | | | 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 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
| * | | | 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
|/ / / / | | | | | | | | | | | | | | | | There are some cases where :path is nil on option and we should respect that.
* | | | try to pass fewer options to `scope`Aaron Patterson2015-08-101-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 itAaron Patterson2015-08-101-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 upAaron Patterson2015-08-101-4/+6
| | | | | | | | | | | | | | | | we only need to check for `path` once.
* | | | Merge pull request #21184 from brooksreese/touch_on_unit_testingRafael Mendonça França2015-08-101-1/+7
|\ \ \ \ | | | | | | | | | | [ci skip] Add link to testing guide
| * | | | [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 job
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Now we can see where `defaults` options originate
* | | | | | avoid calling `scope` on `defaults` methodsAaron Patterson2015-08-101-3/+6
| | | | | |
* | | | | | let the `controller` method push / pop the stackAaron Patterson2015-08-101-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since `controller` and `controller_scope` were the same, just combine them
* | | | | | remove another call to `scope`Aaron Patterson2015-08-101-3/+4
|/ / / / /
* | | | | remove dead codeAaron Patterson2015-08-101-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This method isn't used internally, isn't tested, isn't documented. We should delete it.
* | | | | avoid is_a? callsAaron Patterson2015-08-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | add a predicate method so that we can avoid is_a? calls on the resource object.
* | | | | avoid another call to `scope`Aaron Patterson2015-08-101-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 knowAaron Patterson2015-08-101-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 hashAaron Patterson2015-08-101-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 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]
| * | | | | Update info on browser connection limits [ci skip]Derek Prior2015-08-101-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 stackAaron Patterson2015-08-101-13/+9
| | | | | | | | | | | | | | | | | | | | this gives us an easier way to iterate the stack
* | | | | remove `@nesting` ivarAaron Patterson2015-08-101-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | The same information is stored in the `@scope` linked list, so just get it from there.
* | | | | pass `shallow` in to the resource constructorAaron Patterson2015-08-101-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 itAaron Patterson2015-08-101-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_changeAbdelkader Boudih2015-08-101-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 Reese2015-08-101-5/+5
|/ / / / | | | | | | | | | | | | guides
* | | | docs, use hash instead of a string for `order`. [ci skip]Yves Senn2015-08-101-1/+1
| | | | | | | | | | | | | | | | Closes #21121
* | | | Merge pull request #21124 from kirs/feature/reload-i18nKasper Timm Hansen2015-08-105-3/+114
|\ \ \ \ | | | | | | | | | | Reload I18n.load_path in development
| * | | | 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 engines
| * | | | | make generated scaffold functional tests work inside API enginesyuuji.yaginuma2015-08-092-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * set engine's route in setup * use fixture with engine namespace
* | | | | | Remove wrong commentRafael Mendonça França2015-08-091-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 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 jobRafael Mendonça França2015-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Related with dc1b937db780155089fce522f03d340e62f5df36
* | | | | | WhitespacesRafael Mendonça França2015-08-091-1/+1
| | | | | |
* | | | | | push `scope` calls up one frameAaron Patterson2015-08-091-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`.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 11:31:15 +0000