aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-2520-44/+242
|\
| * copy edits [ci skip]Vijay Dev2012-04-252-2/+2
| * Revert "Added warning that require_tree includes files in unspecified order. ...Vijay Dev2012-04-251-7/+2
| * removing changes made in ccd0b511c933d3e2c7f3e345622ad2cc17728de5 and 189a172...Vijay Dev2012-04-251-2/+0
| * Add partials explanation to getting started guideOscar Del Ben2012-04-251-0/+31
| * Add screenshot to updating post sectionOscar Del Ben2012-04-252-1/+6
| * fix code syntaxOscar Del Ben2012-04-251-2/+2
| * Add include documentation to serializationOscar Del Ben2012-04-251-1/+6
| * improve serialization docOscar Del Ben2012-04-251-4/+5
| * Remove lonely number signAlexey Vakhov2012-04-251-1/+1
| * for get -> forgetUģis Ozols2012-04-251-1/+1
| * Added notice on how to enable gzip compression. Gaurish Sharma2012-04-251-1/+1
| * Added notice on how to enable gzip compression in rails app using Rack::Defla...Gaurish Sharma2012-04-251-0/+2
| * Remove references to 'vendored plugins' except to note they used to exist but...Jonathan Rochkind2012-04-241-6/+4
| * Added warning that require_tree includes files in unspecified order. So, that...Gaurish Sharma2012-04-251-2/+7
| * Added some useful methods to the generators.textileJames Strocel2012-04-241-0/+21
| * Correct documentation of SecurePasswordOscar Del Ben2012-04-241-1/+2
| * make sample code more compactOscar Del Ben2012-04-241-13/+1
| * Add update post section to getting started guideOscar Del Ben2012-04-247-4/+152
| * Fix some code in getting started guideOscar Del Ben2012-04-242-9/+5
| * Missed checked in Form Helper exampleAlexey Vakhov2012-04-241-1/+1
| * Fix markdown in textile.Dmytrii Nagirniak2012-04-231-1/+1
| * Make it explicit that Symbol-s are not officially supported. Dmytrii Nagirniak2012-04-231-0/+2
| * Merge pull request #92 from geetarista/add-faviconVijay Dev2012-04-222-0/+2
| |\
| | * Adds favicon to guides layoutRobby Colvin2012-04-222-0/+2
| * | Add distance_of_time_in_words example for secondsAlexey Vakhov2012-04-221-0/+3
| * | Fixed expected value in comment. Removed duplicate lines in example.Bernard Kroes2012-04-211-4/+1
* | | Merge pull request #5980 from gazay/valid_ipsJeremy Kemper2012-04-252-42/+182
|\ \ \
| * | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ...Alexey Gaziev2012-04-252-42/+182
* | | | Merge pull request #5976 from aderyabin/fix1Jeremy Kemper2012-04-251-5/+0
|\ \ \ \
| * | | | already defined in quotingAndrey Deryabin2012-04-251-5/+0
* | | | | Merge pull request #5978 from aderyabin/fix2Jeremy Kemper2012-04-251-1/+1
|\ \ \ \ \
| * | | | | cleanliness in method parametersAndrey Deryabin2012-04-251-1/+1
| |/ / / /
* | | | | Merge pull request #5880 from asanghi/masterJeremy Kemper2012-04-259-35/+32
|\ \ \ \ \
| * | | | | and one more timeAditya Sanghi2012-04-247-24/+17
| * | | | | another attempt at the languageAditya Sanghi2012-04-186-14/+14
| * | | | | review changes for #5875Aditya Sanghi2012-04-183-6/+6
| * | | | | stamp out ruby-debug19 with extreme prejudice :)Aditya Sanghi2012-04-179-30/+34
* | | | | | Merge pull request #5977 from oscardelben/refactor_serializable_hashJosé Valim2012-04-251-2/+1
|\ \ \ \ \ \
| * | | | | | Minor refactor of serializable hashOscar Del Ben2012-04-251-2/+1
| | |/ / / / | |/| | | |
* / | | | | Remove unnecessary empty line José Valim2012-04-251-1/+0
|/ / / / /
* | | | | Merge pull request #5841 from oscardelben/rename_count_observersJosé Valim2012-04-242-2/+9
|\ \ \ \ \
| * | | | | Rename Observing#count_observers to Observing#observers_countOscar Del Ben2012-04-142-2/+9
* | | | | | Clean up some straggling build failuresJose and Yehuda2012-04-243-10/+10
* | | | | | Remove default match without specified methodJose and Yehuda2012-04-2457-455/+463
* | | | | | Merge pull request #5966 from oscardelben/fix_secure_password_setterJosé Valim2012-04-242-1/+7
|\ \ \ \ \ \
| * | | | | | Fix secure_password setterOscar Del Ben2012-04-242-1/+7
* | | | | | | Merge pull request #5929 from FLOChip/notesJeremy Kemper2012-04-242-4/+14
|\ \ \ \ \ \ \
| * | | | | | | `rake notes` and `rake notes:custom` now supportTeng Siong Ong2012-04-222-4/+14
* | | | | | | | Merge pull request #5965 from oscardelben/refactor_secure_password_authenticateJosé Valim2012-04-241-5/+1
|\ \ \ \ \ \ \ \