aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add docs for Numeric#*_bytes methodsclaudiob2014-12-171-0/+20
| | | | | | | Add docs for `kilobytes`, `megabytes`, `gigabytes`, `terabytes`, `petabytes` and `exabytes`. Fix docs for `bytes`. [ci skip]
* Add docs for Time#find_zoneclaudiob2014-12-171-1/+16
| | | | | | Also improves docs for `Time#find_zone!` [ci skip]
* Fix docs for AS::Notifications::Event#durationclaudiob2014-12-171-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#durationclaudiob2014-12-171-0/+12
| | | | [ci skip]
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-12-153-6/+41
|\
| * [ci skip] Fix output of video_tag helperAnton Cherepanov2014-12-071-1/+4
| |
| * Better doc for AS::DateTime#seconds_since_midnightclaudiob2014-12-041-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'claudiob2014-12-041-4/+32
| |\
| | * Add docs for AS::TimeWithZone + and -claudiob2014-12-041-4/+32
| |/ | | | | | | | | | | The example was taken from the commit message 676d6a6. [ci skip]
| * Merge branch 'master' of github.com:rails/railsVijay Dev2014-11-30396-4136/+3261
| |\
| * | Fix grammar on ActiveRecord::AttributeMethods doc.Hendy Tanata2014-11-261-1/+1
| | | | | | | | | | | | [ci skip]
| * | [Testing guide] Using "Fixtures API" consistentlyPrathamesh Sonpatki2014-11-101-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 Sonpatki2014-11-101-1/+1
| | |
* | | fix a typo [ci skip]Vijay Dev2014-12-151-1/+1
| | |
* | | autoloading guide: adds nesting rule for Kernel#load [ci skip]Xavier Noria2014-12-151-2/+5
| | |
* | | Merge pull request #18026 from hbd225/fix_duplicate_web-console_entriesRafael Mendonça França2014-12-153-10/+22
|\ \ \ | | | | | | | | Fix Duplicate web-console entries in Gemfile
| * | | Fix Duplicate web-console entries in GemfileNorimasaAndo2014-12-143-10/+22
| | | |
* | | | Merge pull request #18035 from claudiob/minor-typos-in-autoloading-guideRafael Mendonça França2014-12-151-5/+5
|\ \ \ \ | | | | | | | | | | Fix minor typos in autoloading guide [ci skip]
| * | | | Fix minor typos in autoloading guideclaudiob2014-12-151-5/+5
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | autoloading guide: some rewordings [ci skip]Xavier Noria2014-12-151-25/+25
|/ / / /
* | | | autoloading guide: more refinements [ci skip]Xavier Noria2014-12-151-10/+11
| | | |
* | | | autoloading guide: more edits [ci skip]Xavier Noria2014-12-151-11/+15
| | | |
* | | | autoloading guide: documents constant resolution algorithmsXavier Noria2014-12-151-18/+51
| | | |
* | | | autoloading guide: damn typos [ci skip]Xavier Noria2014-12-151-2/+2
| | | |
* | | | autoloading guide: documents nestingXavier Noria2014-12-151-62/+160
| | | |
* | | | autoloading guide: minor edits.Yves Senn2014-12-151-20/+19
| | | | | | | | | | | | | | | | /cc @fxn
* | | | autoloading guide: Kernel#autoload -> Module#autoload [ci skip]Xavier Noria2014-12-151-7/+7
| | | |
* | | | autoloading guide: new section about why Kernel#autoload is not involved [ci ↵Xavier Noria2014-12-151-0/+35
| | | | | | | | | | | | | | | | skip]
* | | | autoloading guide: relax type of constant names [ci skip]Xavier Noria2014-12-151-4/+4
| | | |
* | | | autoloading guide, fix typo `Amin` -> `Admin`. [ci skip]Yves Senn2014-12-151-3/+3
| | | | | | | | | | | | | | | | /cc @fxn
* | | | Merge pull request #18030 from zzak/doc-timestamps-null-option-from-generatorYves Senn2014-12-154-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 Scott2014-12-144-25/+25
|/ / / /
* | | | Fix path typo to Article model in Getting Started [ci skip]Zachary Scott2014-12-141-1/+1
| | | |
* | | | Use generic timestamp for generated migration file. [ci skip]Zachary Scott2014-12-141-2/+2
| | | |
* | | | Rephrase this from 3f38762 [ci skip]Zachary Scott2014-12-141-1/+1
| | | |
* | | | Edit pass to section 5.1 of getting started guide [ci skip]Zachary Scott2014-12-141-15/+17
| | | |
* | | | new guide: constant autoloading and reloadingXavier Noria2014-12-152-0/+1075
|/ / /
* | | Merge pull request #18024 from carpodaster/fix/actionview/capture-non-stringsSantiago Pastorino2014-12-144-3/+15
|\ \ \ | | | | | | | | Re-enable capture'ing non-String values
| * | | Re-enable capture'ing non-String valuesCarsten Zimmermann2014-12-144-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-scopesSantiago Pastorino2014-12-133-1/+17
|\ \ \ | | | | | | | | Allow URL helpers to work with optional scopes
| * | | allow URL helpers to work with optional scopesAlex Robbin2014-12-133-1/+17
| | | |
* | | | Merge pull request #18021 from nateberkopec/fix-filter-param-symbol-dupSantiago Pastorino2014-12-132-3/+3
|\ \ \ \ | |/ / / |/| | | ParameterFilter shouldn't try to dup symbol keys
| * | | ParameterFilter shouldn't try to dup symbol keysNate Berkopec2014-12-132-3/+3
|/ / /
* | | Merge pull request #18019 from ↵Aaron Patterson2014-12-131-16/+17
|\ \ \ | | | | | | | | | | | | | | | | eileencodes/pass-connection-rather-than-alias_tracker Pass connection rather than alias_tracker
| * | | Pass connection rather than alias_trackereileencodes2014-12-131-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 White2014-12-133-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 falseTatiana Soukiassian2014-12-133-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 Chan2014-12-121-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 exampleYuki Nishijima2014-12-121-1/+1
|/ / / | | | | | | | | | [ci skip]
* | | redis 3.2.0 doesn't allow tcp protocol anymoreRafael Mendonça França2014-12-131-1/+1
| | | | | | | | | | | | Use redis protocol