Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge pull request #92 from geetarista/add-favicon | Vijay Dev | 2012-04-22 | 2 | -0/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Adds favicon to guides layout | |||||
| | * | | | | | Adds favicon to guides layout | Robby Colvin | 2012-04-22 | 2 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Add distance_of_time_in_words example for seconds | Alexey Vakhov | 2012-04-22 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Fixed expected value in comment. Removed duplicate lines in example. | Bernard Kroes | 2012-04-21 | 1 | -4/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5980 from gazay/valid_ips | Jeremy Kemper | 2012-04-25 | 2 | -42/+182 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remote ip logic and validation. IPv6 support. | |||||
| * | | | | | | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ↵ | Alexey Gaziev | 2012-04-25 | 2 | -42/+182 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests. | |||||
* | | | | | | | | Merge pull request #5976 from aderyabin/fix1 | Jeremy Kemper | 2012-04-25 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Duplicate quote_table_name method | |||||
| * | | | | | | | | already defined in quoting | Andrey Deryabin | 2012-04-25 | 1 | -5/+0 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #5978 from aderyabin/fix2 | Jeremy Kemper | 2012-04-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | cleanliness in method parameters | |||||
| * | | | | | | | | cleanliness in method parameters | Andrey Deryabin | 2012-04-25 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #5880 from asanghi/master | Jeremy Kemper | 2012-04-25 | 9 | -35/+32 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Stamp out ruby-debug with debugger everywhere else in the code base | |||||
| * | | | | | | | | and one more time | Aditya Sanghi | 2012-04-24 | 7 | -24/+17 | |
| | | | | | | | | | ||||||
| * | | | | | | | | another attempt at the language | Aditya Sanghi | 2012-04-18 | 6 | -14/+14 | |
| | | | | | | | | | ||||||
| * | | | | | | | | review changes for #5875 | Aditya Sanghi | 2012-04-18 | 3 | -6/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | stamp out ruby-debug19 with extreme prejudice :) | Aditya Sanghi | 2012-04-17 | 9 | -30/+34 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5977 from oscardelben/refactor_serializable_hash | José Valim | 2012-04-25 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Minor refactor of serializable hash | |||||
| * | | | | | | | | | Minor refactor of serializable hash | Oscar Del Ben | 2012-04-25 | 1 | -2/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* / | | | | | | | | Remove unnecessary empty line | José Valim | 2012-04-25 | 1 | -1/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #5841 from oscardelben/rename_count_observers | José Valim | 2012-04-24 | 2 | -2/+9 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Rename Observing#count_observers to Observing#observers_count | |||||
| * | | | | | | | | Rename Observing#count_observers to Observing#observers_count | Oscar Del Ben | 2012-04-14 | 2 | -2/+9 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Clean up some straggling build failures | Jose and Yehuda | 2012-04-24 | 3 | -10/+10 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Remove default match without specified method | Jose and Yehuda | 2012-04-24 | 57 | -455/+463 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964 | |||||
* | | | | | | | | Merge pull request #5966 from oscardelben/fix_secure_password_setter | José Valim | 2012-04-24 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix secure_password setter | |||||
| * | | | | | | | | Fix secure_password setter | Oscar Del Ben | 2012-04-24 | 2 | -1/+7 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5929 from FLOChip/notes | Jeremy Kemper | 2012-04-24 | 2 | -4/+14 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | `rake notes` and `rake notes:custom` now support css, scss, and css. | |||||
| * | | | | | | | | | `rake notes` and `rake notes:custom` now support | Teng Siong Ong | 2012-04-22 | 2 | -4/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | css, scss and css. | |||||
* | | | | | | | | | | Merge pull request #5965 from oscardelben/refactor_secure_password_authenticate | José Valim | 2012-04-24 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Refactor SecurePassword#authenticate | |||||
| * | | | | | | | | | | Refactor SecurePassword#authenticate | Oscar Del Ben | 2012-04-24 | 1 | -5/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #5963 from kennyj/fix_build_20120425 | Jeremy Kemper | 2012-04-24 | 2 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Fix build. It seems that the Mocha's behavior was changed. | |||||
| * | | | | | | | | | Fix build. It seems that the Mocha's behavior were changed. | kennyj | 2012-04-25 | 2 | -3/+9 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5961 from bogdan/routes | Jeremy Kemper | 2012-04-24 | 1 | -20/+26 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor ActionDispatch::HTTP::Url#url_for | |||||
| * | | | | | | | | | ActionDispatch::HTTP::Url#url_for refactor method | Bogdan Gusiev | 2012-04-24 | 1 | -20/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separated right side url generation(before query string) from left side url generation(after query string) | |||||
* | | | | | | | | | | Merge pull request #5927 from avakhov/distance_of_time_in_words-swap | Jeremy Kemper | 2012-04-24 | 2 | -16/+41 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Distance of time in words should work correctly if from_time > to_time | |||||
| * | | | | | | | | | | Use leap years trick in distance_of_time_in_words only for distances between ↵ | Alexey Vakhov | 2012-04-24 | 2 | -12/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | real date points | |||||
| * | | | | | | | | | | fixed non matching documentation behaviour with method semantics on ↵ | Marcelo Casiraghi | 2012-04-24 | 2 | -3/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | distance_of_time_in_words | |||||
| * | | | | | | | | | | Distance of time in words should work correct if from time > to_time | Alexey Vakhov | 2012-04-24 | 2 | -2/+4 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5956 from arunagw/mocha_upgrade | Jeremy Kemper | 2012-04-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Upgrading to Mocha 0.11.2 to fix Object#method override | |||||
| * | | | | | | | | | | | Upgrading mocha 0.11.2 | Arun Agrawal | 2012-04-24 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5960 from homakov/patch-3 | José Valim | 2012-04-24 | 1 | -5/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Delete insecure and "bad practice" code. | |||||
| * | | | | | | | | | | | Deleting insecure and "bad practice" code. related: ↵ | Egor Homakov | 2012-04-24 | 1 | -5/+2 | |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://homakov.blogspot.com/2012/04/whitelist-your-routes-match-is-evil.html | |||||
* | | | | | | | | | | | Merge pull request #5959 from carlosantoniodasilva/refactor-route_set | Aaron Patterson | 2012-04-24 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | Refactor hash creation in routeset | |||||
| * | | | | | | | | | | Refactor hash creation in routeset | Carlos Antonio da Silva | 2012-04-24 | 1 | -3/+4 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5957 from bogdan/routes | José Valim | 2012-04-24 | 1 | -26/+20 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | RouteSet: decomplecting a way to handle positional args | |||||
| * | | | | | | | | | RouteSet: decomplecting a way to handle positional args | Bogdan Gusiev | 2012-04-24 | 1 | -26/+20 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5955 from bogdan/routes | José Valim | 2012-04-24 | 1 | -13/+21 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | RouteSet: simplify routes helpers generation code | |||||
| * | | | | | | | | | RouteSet: simplify routes helpers generation code | Bogdan Gusiev | 2012-04-24 | 1 | -13/+21 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5954 from bogdan/routes | José Valim | 2012-04-24 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Add missing requires in routes | |||||
| * | | | | | | | | Add missing requires in routes | Bogdan Gusiev | 2012-04-23 | 2 | -0/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Only include Rake::DSL if it's defined. | Joe Van Dyk | 2012-04-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rake < 0.9 doesn't define Rake::DSL. | |||||
* | | | | | | | | | Merge pull request #5887 from mcrowe/document-relation-merge | Vijay Dev | 2012-04-23 | 1 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Add documentation to the SpawnMethods#merge method. |