aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18038 from seuros/typofixRafael Mendonça França2014-12-151-1/+1
|\
| * fix a typo [ci skip]Abdelkader Boudih2014-12-151-1/+1
* | 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
| * 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
| |/
| * 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
| * | [Testing guide] Using "Fixtures API" consistentlyPrathamesh Sonpatki2014-11-101-1/+1
| * | [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 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 guideclaudiob2014-12-151-5/+5
* | | | | 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
* | | | 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
* | | | 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
* | | | 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]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 valuesCarsten Zimmermann2014-12-144-3/+15
|/ / /
* | | Merge pull request #18022 from agrobbin/url-helpers-optional-scopesSantiago Pastorino2014-12-133-1/+17
|\ \ \
| * | | 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 keysNate Berkopec2014-12-132-3/+3
|/ / /
* | | Merge pull request #18019 from eileencodes/pass-connection-rather-than-alias_...Aaron Patterson2014-12-131-16/+17
|\ \ \
| * | | Pass connection rather than alias_trackereileencodes2014-12-131-16/+17
* | | | Merge pull request #18020 from binaryberry/handle-positional-args-with-format...Andrew White2014-12-133-2/+42
|\ \ \ \ | |/ / / |/| | |
| * | | Fix handling of positional url helper arguments when format is falseTatiana Soukiassian2014-12-133-2/+42
|/ / /
* | | Merge pull request #18018 from yuki24/fix-method-name-inconsistency-in-mailer...Godfrey Chan2014-12-121-1/+1
|\ \ \
| * | | [guides] Fix method name inconsistency in a mailer exampleYuki Nishijima2014-12-121-1/+1
|/ / /
* | | redis 3.2.0 doesn't allow tcp protocol anymoreRafael Mendonça França2014-12-131-1/+1
* | | Merge pull request #18006 from sikachu/add-params-to_unsafe_hRafael Mendonça França2014-12-122-0/+12
|\ \ \
| * | | Add AC::Parameters#to_unsafe_hPrem Sichanugrist2014-12-122-0/+12