Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add docs for Time#find_zone | claudiob | 2014-12-17 | 1 | -1/+16 |
| | | | | | | Also improves docs for `Time#find_zone!` [ci skip] | ||||
* | Fix docs for AS::Notifications::Event#duration | claudiob | 2014-12-17 | 1 | -2/+2 |
| | | | | | | | | | Stems from comments by @zzak on e07f3dd: * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015634 * https://github.com/rails/docrails/commit/e07f3ddcac394d2a8dc23fc571318b7e8c2497b1#commitcomment-9015639 [ci skip] | ||||
* | Add docs for AS::Notifications::Event#duration | claudiob | 2014-12-17 | 1 | -0/+12 |
| | | | | [ci skip] | ||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-12-15 | 3 | -6/+41 |
|\ | |||||
| * | [ci skip] Fix output of video_tag helper | Anton Cherepanov | 2014-12-07 | 1 | -1/+4 |
| | | |||||
| * | Better doc for AS::DateTime#seconds_since_midnight | claudiob | 2014-12-04 | 1 | -1/+5 |
| | | | | | | | | | | Adds examples and keeps coherent with the documentation of the similar method `seconds_until_end_of_day`. [ci skip] | ||||
| * | Merge branch 'document-time-with-zone-plus-and-minus' | claudiob | 2014-12-04 | 1 | -4/+32 |
| |\ | |||||
| | * | Add docs for AS::TimeWithZone + and - | claudiob | 2014-12-04 | 1 | -4/+32 |
| |/ | | | | | | | | | | | The example was taken from the commit message 676d6a6. [ci skip] | ||||
| * | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2014-11-30 | 396 | -4136/+3261 |
| |\ | |||||
| * | | Fix grammar on ActiveRecord::AttributeMethods doc. | Hendy Tanata | 2014-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | [Testing guide] Using "Fixtures API" consistently | Prathamesh Sonpatki | 2014-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - In guides, "API" is used consistently instead of "api". - Reason behind replacing "fixtures API" to "Fixtures API" is because here we are referring to the concept of "fixtures". In other places in the guide "fixture" OR "fixtures" is referred to the single or multiple instances of test data. - This is also followup of https://github.com/rails/docrails/commit/aa9d1332b20305dd860b21a7ada06c5252bebad5#commitcomment-8497376. | ||||
| * | | [Testing guide] Use "Fixtures API" instead of "fixture api". | Prathamesh Sonpatki | 2014-11-10 | 1 | -1/+1 |
| | | | |||||
* | | | fix a typo [ci skip] | Vijay Dev | 2014-12-15 | 1 | -1/+1 |
| | | | |||||
* | | | autoloading guide: adds nesting rule for Kernel#load [ci skip] | Xavier Noria | 2014-12-15 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #18026 from hbd225/fix_duplicate_web-console_entries | Rafael Mendonça França | 2014-12-15 | 3 | -10/+22 |
|\ \ \ | | | | | | | | | Fix Duplicate web-console entries in Gemfile | ||||
| * | | | Fix Duplicate web-console entries in Gemfile | NorimasaAndo | 2014-12-14 | 3 | -10/+22 |
| | | | | |||||
* | | | | Merge pull request #18035 from claudiob/minor-typos-in-autoloading-guide | Rafael Mendonça França | 2014-12-15 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Fix minor typos in autoloading guide [ci skip] | ||||
| * | | | | Fix minor typos in autoloading guide | claudiob | 2014-12-15 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | autoloading guide: some rewordings [ci skip] | Xavier Noria | 2014-12-15 | 1 | -25/+25 |
|/ / / / | |||||
* | | | | autoloading guide: more refinements [ci skip] | Xavier Noria | 2014-12-15 | 1 | -10/+11 |
| | | | | |||||
* | | | | autoloading guide: more edits [ci skip] | Xavier Noria | 2014-12-15 | 1 | -11/+15 |
| | | | | |||||
* | | | | autoloading guide: documents constant resolution algorithms | Xavier Noria | 2014-12-15 | 1 | -18/+51 |
| | | | | |||||
* | | | | autoloading guide: damn typos [ci skip] | Xavier Noria | 2014-12-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | autoloading guide: documents nesting | Xavier Noria | 2014-12-15 | 1 | -62/+160 |
| | | | | |||||
* | | | | autoloading guide: minor edits. | Yves Senn | 2014-12-15 | 1 | -20/+19 |
| | | | | | | | | | | | | | | | | /cc @fxn | ||||
* | | | | autoloading guide: Kernel#autoload -> Module#autoload [ci skip] | Xavier Noria | 2014-12-15 | 1 | -7/+7 |
| | | | | |||||
* | | | | autoloading guide: new section about why Kernel#autoload is not involved [ci ↵ | Xavier Noria | 2014-12-15 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | skip] | ||||
* | | | | autoloading guide: relax type of constant names [ci skip] | Xavier Noria | 2014-12-15 | 1 | -4/+4 |
| | | | | |||||
* | | | | autoloading guide, fix typo `Amin` -> `Admin`. [ci skip] | Yves Senn | 2014-12-15 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | /cc @fxn | ||||
* | | | | Merge pull request #18030 from zzak/doc-timestamps-null-option-from-generator | Yves Senn | 2014-12-15 | 4 | -25/+25 |
|\ \ \ \ | | | | | | | | | | | Add `null` option to timestamps as migration generator does [ci skip] | ||||
| * | | | | Add `null` option to timestamps as migration generator does [ci skip] | Zachary Scott | 2014-12-14 | 4 | -25/+25 |
|/ / / / | |||||
* | | | | Fix path typo to Article model in Getting Started [ci skip] | Zachary Scott | 2014-12-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use generic timestamp for generated migration file. [ci skip] | Zachary Scott | 2014-12-14 | 1 | -2/+2 |
| | | | | |||||
* | | | | Rephrase this from 3f38762 [ci skip] | Zachary Scott | 2014-12-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Edit pass to section 5.1 of getting started guide [ci skip] | Zachary Scott | 2014-12-14 | 1 | -15/+17 |
| | | | | |||||
* | | | | new guide: constant autoloading and reloading | Xavier Noria | 2014-12-15 | 2 | -0/+1075 |
|/ / / | |||||
* | | | Merge pull request #18024 from carpodaster/fix/actionview/capture-non-strings | Santiago Pastorino | 2014-12-14 | 4 | -3/+15 |
|\ \ \ | | | | | | | | | Re-enable capture'ing non-String values | ||||
| * | | | Re-enable capture'ing non-String values | Carsten Zimmermann | 2014-12-14 | 4 | -3/+15 |
|/ / / | | | | | | | | | | | | | | | | | | | This has been discussed in #17661 and partially reverts the changes made in 9de83050d3a4b260d4aeb5d09ec4eb64f913ba64 and 986cac73e3c56b3dfa22fd1464f6913e38d32cc3 The test case added to content_for acts as a regression / acceptance test. | ||||
* | | | Merge pull request #18022 from agrobbin/url-helpers-optional-scopes | Santiago Pastorino | 2014-12-13 | 3 | -1/+17 |
|\ \ \ | | | | | | | | | Allow URL helpers to work with optional scopes | ||||
| * | | | allow URL helpers to work with optional scopes | Alex Robbin | 2014-12-13 | 3 | -1/+17 |
| | | | | |||||
* | | | | Merge pull request #18021 from nateberkopec/fix-filter-param-symbol-dup | Santiago Pastorino | 2014-12-13 | 2 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | ParameterFilter shouldn't try to dup symbol keys | ||||
| * | | | ParameterFilter shouldn't try to dup symbol keys | Nate Berkopec | 2014-12-13 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #18019 from ↵ | Aaron Patterson | 2014-12-13 | 1 | -16/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | eileencodes/pass-connection-rather-than-alias_tracker Pass connection rather than alias_tracker | ||||
| * | | | Pass connection rather than alias_tracker | eileencodes | 2014-12-13 | 1 | -16/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we're only using the `connection` so passing the entire tracker isn't unnecessary. Eventually only the `connection` will be passed to `add_constraints` with later refactoring but curretly that's not possible because of `construct_tables` method. | ||||
* | | | | Merge pull request #18020 from ↵ | Andrew White | 2014-12-13 | 3 | -2/+42 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | binaryberry/handle-positional-args-with-format-false Fix handling of positional url helper arguments when format is false | ||||
| * | | | Fix handling of positional url helper arguments when format is false | Tatiana Soukiassian | 2014-12-13 | 3 | -2/+42 |
|/ / / | | | | | | | | | | | | | | | | | | | There is no need to subtract one from the path_params size when there is no format parameter because it is not present in the path_params array. Fixes #17819. | ||||
* | | | Merge pull request #18018 from ↵ | Godfrey Chan | 2014-12-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | yuki24/fix-method-name-inconsistency-in-mailer-example [guides] Fix method name inconsistency in a mailer example | ||||
| * | | | [guides] Fix method name inconsistency in a mailer example | Yuki Nishijima | 2014-12-12 | 1 | -1/+1 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | redis 3.2.0 doesn't allow tcp protocol anymore | Rafael Mendonça França | 2014-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | Use redis protocol | ||||
* | | | Merge pull request #18006 from sikachu/add-params-to_unsafe_h | Rafael Mendonça França | 2014-12-12 | 2 | -0/+12 |
|\ \ \ | | | | | | | | | Add AC::Parameters#to_unsafe_h |