aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* revises requires of some AS deprecation filesXavier Noria2012-04-053-3/+4
|
* documents the contract for the argument of AD::Routing::RouteSet#url_forXavier Noria2012-04-051-0/+1
|
* Merge pull request #5751 from rafaelfranca/fix-buildXavier Noria2012-04-053-2/+11
|\ | | | | Fix url_for when options is nil
| * Make url_for work when option is nil and default_url_options hasRafael Mendonça França2012-04-052-1/+10
| | | | | | | | stringified keys
| * Fix url_for when options is nilRafael Mendonça França2012-04-051-1/+1
| | | | | | | | | | RouteSet#url_for was modifying the options hash that belong to the caller
* | Merge pull request #5753 from ↵José Valim2012-04-052-1/+3
|\ \ | |/ |/| | | | | carlosantoniodasilva/as-remove-require-and-warnings Remove circular require from AS Deprecation, and fix warnings
| * Initialize variables in file update checker to avoid warningsCarlos Antonio da Silva2012-04-051-0/+3
| |
| * Remove not used require from as to avoid circular requiresCarlos Antonio da Silva2012-04-051-1/+0
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-058-54/+41
|\
| * lets not show too much output and shadow the intention [ci skip]Vijay Dev2012-04-051-20/+3
| |
| * minor fixes [ci skip]Vijay Dev2012-04-051-2/+2
| |
| * fix boolean value in guide [ci skip]Vijay Dev2012-04-051-1/+1
| |
| * Revert "Update activemodel rdoc links"Vijay Dev2012-04-051-12/+12
| | | | | | | | | | | | | | This reverts commit ddb987551357d30301ab8cd99f4580988fa83340. Reason: The links must be relative so that they will work both in edge and stable api sites.
| * Fix slightly awkward English in Action Caching section of Caching With Rails ↵Cheah Chu Yeow2012-04-051-1/+1
| | | | | | | | | | | | guide. In particular, removed "pages that require to restrict access somehow" and shortened "Action Caching works like Page Caching except for the fact that the incoming web request does go from the webserver to the Rails stack and Action Pack so that before filters can be run on it before the cache is served".
| * Add AC record identifier example with not-persisted objectAlexey Vakhov2012-04-051-0/+1
| |
| * Small improvements added to getting startedSandip Ransing2012-04-051-5/+5
| |
| * Revert "update ActionPack README links"Vijay Dev2012-04-051-10/+10
| | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub.
| * update ActionPack README linksHrvoje Šimić2012-04-051-10/+10
| |
| * Update activemodel rdoc linksJonathan Mazin2012-04-041-12/+12
| |
| * Updated migrations.textile to change :integer on line 807 to :boolean, as it ↵Ethan Mick2012-04-041-1/+1
| | | | | | | | was earlier in the example. :flag is a boolean, not an integer. (defaults to false)
| * Improve config.assets.initialize_on_precompile guide.Hendy Tanata2012-04-041-2/+2
| |
| * Merge branch 'master' of github.com:lifo/docrailsHrvoje Šimić2012-04-041-10/+10
| |\
| | * Revert "update ActionPack README links"Vijay Dev2012-04-041-10/+10
| | | | | | | | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub.
| * | removed deprecated methods and middlewaresHrvoje Šimić2012-04-041-30/+34
| |/
| * added example, removed blank linesHrvoje Šimić2012-04-042-14/+13
| |
| * update ActionPack README linksHrvoje Šimić2012-04-041-10/+10
| |
* | Merge pull request #5182 from castlerock/content_tag_instead_stringXavier Noria2012-04-051-2/+2
|\ \ | | | | | | content_tag used instead string for option
| * | content_tag used instead string for optionVishnu Atrai2012-02-261-2/+2
| | |
* | | Merge pull request #5750 from ahoward/masterAaron Patterson2012-04-052-2/+22
|\ \ \ | | | | | | | | mo fasta and mo betta the url_for
| * | | url_for: avoid a nil check. unroll a loop. handle most common case 1st.ara.t.howard2012-04-051-18/+13
| | | |
| * | | carefully and quickly merge url_for optionsara.t.howard2012-04-042-1/+26
| | | |
* | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetchXavier Noria2012-04-051-1/+1
|\ \ \ \ | | | | | | | | | | removed unnecessary block when using fetch
| * | | | removed unnecessary block when using fetchWojciech Wnętrzak2012-04-021-1/+1
| | | | |
* | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-052-1/+8
|\ \ \ \ \ | | | | | | | | | | | | prevent the cache sweeper ignores NoMethodError
| * | | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-292-1/+8
| | | | | |
* | | | | | Merge pull request #3084 from esad/masterXavier Noria2012-04-051-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dependency fix for activesupport
| * | | | | | Add a missing require for 'active_support/deprecation' in Module#deprecateEsad Hajdarevic2011-09-201-0/+2
| | | | | | |
* | | | | | | Merge pull request #5747 from mneisen/patch-1Xavier Noria2012-04-051-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Optimistic locking: lock_version needed type information.
| * | | | | | Optimistic locking: lock_version needed type information.Martin Eisenhardt2012-04-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-0417-20/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated/changed unneeded tr/gsubs
| * | | | | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-0317-20/+20
| | | | | | |
* | | | | | | Merge pull request #5188 from jlxw/patch-1Santiago Pastorino2012-04-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | logger.silence is deprecated
| * | | | | | | logger.silence is deprecatedjlxw2012-02-271-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5733 from oscardelben/patch-5Santiago Pastorino2012-04-041-2/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | No need to extend ActiveSupport::Extend here
| * | | | | | | No need to extend ActiveSupport::Extend hereOscar Del Ben2012-04-041-2/+0
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-048-25/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/engines.textile
| * | | | | | | Revert "rails 4 will support ruby version 1.9.4 or higher"Vijay Dev2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0a35acb8b89603a3135852742f206af82ed61b57. Reason: Let's cross the bridge when we reach there.
| * | | | | | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
| | | | | | | |
| * | | | | | | typo mistake fixedSandip Ransing2012-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correction to server stop statement added
| * | | | | | | rails 4 will support ruby version 1.9.4 or higherSandip Ransing2012-04-041-1/+1
| | | | | | | |