aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-2595-667/+873
|\
| * 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
| * | 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
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor SecurePassword#authenticateOscar Del Ben2012-04-241-5/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #5963 from kennyj/fix_build_20120425Jeremy Kemper2012-04-242-3/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-252-3/+9
| |/ / / / / /
| * | | | | | Merge pull request #5961 from bogdan/routesJeremy Kemper2012-04-241-20/+26
| |\ \ \ \ \ \
| | * | | | | | ActionDispatch::HTTP::Url#url_for refactor methodBogdan Gusiev2012-04-241-20/+26
| * | | | | | | Merge pull request #5927 from avakhov/distance_of_time_in_words-swapJeremy Kemper2012-04-242-16/+41
| |\ \ \ \ \ \ \
| | * | | | | | | Use leap years trick in distance_of_time_in_words only for distances between ...Alexey Vakhov2012-04-242-12/+18
| | * | | | | | | fixed non matching documentation behaviour with method semantics on distance_...Marcelo Casiraghi2012-04-242-3/+20
| | * | | | | | | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-242-2/+4
| * | | | | | | | Merge pull request #5956 from arunagw/mocha_upgradeJeremy Kemper2012-04-241-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Upgrading mocha 0.11.2Arun Agrawal2012-04-241-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #5960 from homakov/patch-3José Valim2012-04-241-5/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Deleting insecure and "bad practice" code. related: http://homakov.blogspot.c...Egor Homakov2012-04-241-5/+2
| |/ / / / / / / /
| * | | | | | | | Merge pull request #5959 from carlosantoniodasilva/refactor-route_setAaron Patterson2012-04-241-3/+4
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Refactor hash creation in routesetCarlos Antonio da Silva2012-04-241-3/+4
| |/ / / / / / /
| * | | | | | | Merge pull request #5957 from bogdan/routesJosé Valim2012-04-241-26/+20
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | RouteSet: decomplecting a way to handle positional argsBogdan Gusiev2012-04-241-26/+20
| |/ / / / / /
| * | | | | | Merge pull request #5955 from bogdan/routesJosé Valim2012-04-241-13/+21
| |\ \ \ \ \ \
| | * | | | | | RouteSet: simplify routes helpers generation codeBogdan Gusiev2012-04-241-13/+21
| |/ / / / / /
| * | | | | | Merge pull request #5954 from bogdan/routesJosé Valim2012-04-242-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add missing requires in routesBogdan Gusiev2012-04-232-0/+3
| * | | | | | Only include Rake::DSL if it's defined.Joe Van Dyk2012-04-231-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:01:07 +0000