Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5753 from ↵ | José Valim | 2012-04-05 | 2 | -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 warnings | Carlos Antonio da Silva | 2012-04-05 | 1 | -0/+3 |
| | | |||||
| * | Remove not used require from as to avoid circular requires | Carlos Antonio da Silva | 2012-04-05 | 1 | -1/+0 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-05 | 8 | -54/+41 |
|\ | |||||
| * | lets not show too much output and shadow the intention [ci skip] | Vijay Dev | 2012-04-05 | 1 | -20/+3 |
| | | |||||
| * | minor fixes [ci skip] | Vijay Dev | 2012-04-05 | 1 | -2/+2 |
| | | |||||
| * | fix boolean value in guide [ci skip] | Vijay Dev | 2012-04-05 | 1 | -1/+1 |
| | | |||||
| * | Revert "Update activemodel rdoc links" | Vijay Dev | 2012-04-05 | 1 | -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 Yeow | 2012-04-05 | 1 | -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 object | Alexey Vakhov | 2012-04-05 | 1 | -0/+1 |
| | | |||||
| * | Small improvements added to getting started | Sandip Ransing | 2012-04-05 | 1 | -5/+5 |
| | | |||||
| * | Revert "update ActionPack README links" | Vijay Dev | 2012-04-05 | 1 | -10/+10 |
| | | | | | | | | | | | | This reverts commit aeb228c5be5e8a1e7d79ccaef3833f8f35b00046. Reason: The links are meant to be consumed in the api and not on GitHub. | ||||
| * | update ActionPack README links | Hrvoje Šimić | 2012-04-05 | 1 | -10/+10 |
| | | |||||
| * | Update activemodel rdoc links | Jonathan Mazin | 2012-04-04 | 1 | -12/+12 |
| | | |||||
| * | Updated migrations.textile to change :integer on line 807 to :boolean, as it ↵ | Ethan Mick | 2012-04-04 | 1 | -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 Tanata | 2012-04-04 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Hrvoje Šimić | 2012-04-04 | 1 | -10/+10 |
| |\ | |||||
| | * | Revert "update ActionPack README links" | Vijay Dev | 2012-04-04 | 1 | -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 middlewares | Hrvoje Šimić | 2012-04-04 | 1 | -30/+34 |
| |/ | |||||
| * | added example, removed blank lines | Hrvoje Šimić | 2012-04-04 | 2 | -14/+13 |
| | | |||||
| * | update ActionPack README links | Hrvoje Šimić | 2012-04-04 | 1 | -10/+10 |
| | | |||||
* | | Merge pull request #5182 from castlerock/content_tag_instead_string | Xavier Noria | 2012-04-05 | 1 | -2/+2 |
|\ \ | | | | | | | content_tag used instead string for option | ||||
| * | | content_tag used instead string for option | Vishnu Atrai | 2012-02-26 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #5750 from ahoward/master | Aaron Patterson | 2012-04-05 | 2 | -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.howard | 2012-04-05 | 1 | -18/+13 |
| | | | | |||||
| * | | | carefully and quickly merge url_for options | ara.t.howard | 2012-04-04 | 2 | -1/+26 |
| | | | | |||||
* | | | | Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch | Xavier Noria | 2012-04-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | removed unnecessary block when using fetch | ||||
| * | | | | removed unnecessary block when using fetch | Wojciech Wnętrzak | 2012-04-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #4446 from ayamomiji/patch-1 | José Valim | 2012-04-05 | 2 | -1/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | prevent the cache sweeper ignores NoMethodError | ||||
| * | | | | | prevent the cache sweeper ignores NoMethodError | ayaya | 2012-03-29 | 2 | -1/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #3084 from esad/master | Xavier Noria | 2012-04-05 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Dependency fix for activesupport | ||||
| * | | | | | | Add a missing require for 'active_support/deprecation' in Module#deprecate | Esad Hajdarevic | 2011-09-20 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5747 from mneisen/patch-1 | Xavier Noria | 2012-04-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Optimistic locking: lock_version needed type information. | ||||
| * | | | | | | Optimistic locking: lock_version needed type information. | Martin Eisenhardt | 2012-04-05 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanup | Santiago Pastorino | 2012-04-04 | 17 | -20/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updated/changed unneeded tr/gsubs | ||||
| * | | | | | | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 17 | -20/+20 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5188 from jlxw/patch-1 | Santiago Pastorino | 2012-04-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | logger.silence is deprecated | ||||
| * | | | | | | | logger.silence is deprecated | jlxw | 2012-02-27 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #5733 from oscardelben/patch-5 | Santiago Pastorino | 2012-04-04 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | No need to extend ActiveSupport::Extend here | ||||
| * | | | | | | | No need to extend ActiveSupport::Extend here | Oscar Del Ben | 2012-04-04 | 1 | -2/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-04 | 8 | -25/+83 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/engines.textile | ||||
| * | | | | | | | Revert "rails 4 will support ruby version 1.9.4 or higher" | Vijay Dev | 2012-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0a35acb8b89603a3135852742f206af82ed61b57. Reason: Let's cross the bridge when we reach there. | ||||
| * | | | | | | | Fix AC responder example | Alexey Vakhov | 2012-04-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | typo mistake fixed | Sandip Ransing | 2012-04-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correction to server stop statement added | ||||
| * | | | | | | | rails 4 will support ruby version 1.9.4 or higher | Sandip Ransing | 2012-04-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixed small typo | Fernando Briano | 2012-04-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | also <text> replaced by <plain> | Mikhail Dieterle | 2012-04-04 | 1 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Changed engines guide not to use a css tag. <plain> will do just fine. | Mikhail Dieterle | 2012-04-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/lifo/docrails/commit/bb23d6fb005edaf25f5b294f9215429fb44b3f3d | ||||
| * | | | | | | | Remove non-obligatory params in AC respond_to examples | Alexey Vakhov | 2012-04-03 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Remove unnecessary articles. | Waseem Ahmad | 2012-04-03 | 1 | -3/+3 |
| | | | | | | | |