Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make RedCloth not convert double hyphens to emdashes. Closes #5292 | Vijay Dev | 2012-05-06 | 1 | -0/+6 |
| | | | | | | | | | | As mentioned in http://redcloth.org/textile/writing-paragraph-text/#dashes RedCloth converts double hyphens to emdashes. This causes problems in the guides where options like --database, --full are rendered incorrectly. This commit fixes it by customizing the emdash method in the RedCloth::Formatters::HTML module to just return '--'. See their FAQ http://redcloth.org/faq in the section 'How do I customize RedCloth?' | ||||
* | Merge pull request #6176 from nashby/checkboxes | José Valim | 2012-05-05 | 2 | -1/+10 |
|\ | | | | | check checkboxes with array of strings as :checked option | ||||
| * | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 2 | -1/+10 |
| | | |||||
* | | some corrections in the AR query guide [ci skip] | Vijay Dev | 2012-05-05 | 1 | -13/+15 |
| | | |||||
* | | Merge pull request #6175 from mhfs/guide_take_first_last | Vijay Dev | 2012-05-05 | 1 | -8/+42 |
|\ \ | |/ |/| | Update `first`, `last` and `take` in guides | ||||
| * | Update `first`, `last` and `take` in guides | Marcelo Silveira | 2012-05-05 | 1 | -8/+42 |
|/ | |||||
* | Try to convert object passed to debug_hash to hash | Piotr Sarnacki | 2012-05-05 | 1 | -2/+2 |
| | | | | | | | | | | SessionStore was recently changed to delegate to hash object instead of inherit from it. Since we don't want to extend SessionStore with every method implemented in Hash, it's better to just convert any object passed to debug_hash (which is also better as we don't require to pass Hash instance there, it can be any object that can be converted to Hash). | ||||
* | Merge pull request #6169 from marcandre/respond_to_missing | José Valim | 2012-05-05 | 6 | -6/+24 |
|\ | | | | | Respond to missing | ||||
| * | Use respond_to_missing for TimeWithZone | Marc-Andre Lafortune | 2012-05-05 | 2 | -3/+4 |
| | | |||||
| * | Use respond_to_missing? for Chars | Marc-Andre Lafortune | 2012-05-05 | 2 | -2/+11 |
| | | |||||
| * | Use respond_to_missing? for OrderedOptions | Marc-Andre Lafortune | 2012-05-05 | 2 | -1/+9 |
| | | |||||
* | | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 |
| | | | | | | | | closes #4894 | ||||
* | | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 3 | -2/+12 |
| | | |||||
* | | Change unless + ! into if | Piotr Sarnacki | 2012-05-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 2 | -2/+19 |
|\ \ | | | | | | | postgresql adapter should quote not a number and infinity correctly for float columns | ||||
| * | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 2 | -2/+19 |
| | | | |||||
* | | | need to dup the default options so that mutations will not impact us | Aaron Patterson | 2012-05-04 | 1 | -1/+1 |
| | | | |||||
* | | | make sure the superclass matches so load order does not matter | Aaron Patterson | 2012-05-04 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #6156 from mjtko/feature-beginning_of_hour | Jeremy Kemper | 2012-05-04 | 5 | -0/+56 |
|\ \ \ | | | | | | | | | Beginning and end of hour support for Time and DateTime | ||||
| * | | | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 5 | -0/+56 |
| | | | | |||||
* | | | | Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactor | Jeremy Kemper | 2012-05-04 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use Hash#fetch instead of has_key? check | ||||
| * | | | | Use Hash#fetch instead of has_key? check | Carlos Antonio da Silva | 2012-05-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-tests | Andrew White | 2012-05-04 | 1 | -8/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | Enable misnamed time_with_timezone_tests in activesupport core_ext | ||||
| * | | | | enable tests for beginning_of_* and end_of_* within time zone tests; enable ↵ | Mark J. Titorenko | 2012-05-04 | 1 | -8/+8 |
| |/ / / | | | | | | | | | | | | | test for future_with_time_current_as_time_with_zone; fix beginning_of_month test. | ||||
* | | | | Merge pull request #4445 from nragaz/role_based_params_wrapping | José Valim | 2012-05-04 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | | specify a role for identifying accessible attributes when wrapping params | ||||
* | | | | Merge pull request #5808 from avakhov/assert-template-layout-improve | José Valim | 2012-05-04 | 3 | -6/+60 |
|\ \ \ \ | | | | | | | | | | | Assert template layout improve | ||||
| * | | | | Improve assert_template layout checking | Alexey Vakhov | 2012-05-04 | 2 | -3/+30 |
| | | | | | |||||
| * | | | | Fix assert_template :layout => nil assertion | Alexey Vakhov | 2012-05-04 | 2 | -2/+17 |
| | | | | | |||||
| * | | | | Fix assert_template assertion with :layout option | Alexey Vakhov | 2012-05-04 | 3 | -1/+13 |
|/ / / / | |||||
* | | | | Merge pull request #6160 from ↵ | Aaron Patterson | 2012-05-04 | 3 | -5/+13 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | carlosantoniodasilva/resource-route-canonical-action Force given path to http methods in mapper to skip canonical action checking | ||||
| * | | | | Force given path to http methods in mapper to skip canonical action checking | Carlos Antonio da Silva | 2012-05-04 | 3 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following scenario: resources :contacts do post 'new', action: 'new', on: :collection, as: :new end Where the /new path is not generated because it's considered a canonical action, part of the normal resource actions: new_contacts POST /contacts(.:format) contacts#new Fixes #2999 | ||||
* | | | | | fix doc [ci skip] | Vijay Dev | 2012-05-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | session creation methods to a module | Aaron Patterson | 2012-05-04 | 3 | -24/+11 |
| | | | | | |||||
* | | | | | Merge pull request #6154 from shaliko/patch-1 | Vijay Dev | 2012-05-04 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update documentation for button_to. | ||||
| * | | | | Update documentation for button_to. | Shalva Usubov | 2012-05-04 | 1 | -1/+6 |
| |/ / / | |||||
* | | | | update invalid partial error message as per ↵ | Vijay Dev | 2012-05-04 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | 04202a3f8d66c0675eac41fbf63309f4be356e81 | ||||
* | | | | Merge pull request #6159 from marcandre/fix_bad_partial_error_mess | Vijay Dev | 2012-05-04 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Adjust error message for partial names starting with an uppercase letter... | ||||
| * | | | | Adjust error message for partial names starting with an uppercase letter. | Marc-Andre Lafortune | 2012-05-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | create a request session in the cookie stores | Aaron Patterson | 2012-05-04 | 1 | -0/+8 |
| | | | | | |||||
* | | | | | create a request::session object in the memecache store middleware | Aaron Patterson | 2012-05-04 | 1 | -0/+10 |
|/ / / / | |||||
* | | | | Merge branch 'master' into session | Aaron Patterson | 2012-05-04 | 67 | -853/+881 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (55 commits) extract deprecated dynamic methods Add some docs and changelog entry Allow overriding exception handling in threaded consumer Allow configuring a different queue consumer actually don't need to expand the aggregates at all #to_sym is unnecessary de-globalise method extract code from AR::Base clean up implementation of dynamic methods. use method compilation etc. Fix ActiveModel README example mention database mapping in getting started guide Remove vestiges of the http_only! config from configuring guide Remove content-length as well Make ActionController#head pass rack-link RouteSet: optimize routes generation when globbing is used Allows assert_redirected_to to accept a regular expression use extract_options! No need to force conversion to Symbol since case ensures it's already one. No need to work around 1.8 warnings anymore. Update command line guide ... | ||||
| * | | | extract deprecated dynamic methods | Jon Leighton | 2012-05-04 | 2 | -142/+40 |
| | | | | |||||
| * | | | Merge pull request #6153 from carlosantoniodasilva/queue-consumer | José Valim | 2012-05-04 | 8 | -23/+89 |
| |\ \ \ | | | | | | | | | | | Configurable queue consumer | ||||
| | * | | | Add some docs and changelog entry | Carlos Antonio da Silva | 2012-05-04 | 3 | -13/+21 |
| | | | | | |||||
| | * | | | Allow overriding exception handling in threaded consumer | Carlos Antonio da Silva | 2012-05-04 | 2 | -1/+24 |
| | | | | | |||||
| | * | | | Allow configuring a different queue consumer | Carlos Antonio da Silva | 2012-05-04 | 4 | -9/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make sure to not use default queue consumer with custom queue implementation. It is up to the new queue implementation to start / shutdown the consumer. | ||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-04 | 20 | -377/+150 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix ActiveModel README example | Alexey Vakhov | 2012-05-04 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | mention database mapping in getting started guide | Oscar Del Ben | 2012-05-04 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Remove vestiges of the http_only! config from configuring guide | Carlos Antonio da Silva | 2012-05-03 | 1 | -8/+0 |
| | | | | |