aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6156 from mjtko/feature-beginning_of_hourJeremy Kemper2012-05-045-0/+56
|\ | | | | Beginning and end of hour support for Time and DateTime
| * added beginning_of_hour support to core_ext calculations for Time and DateTimeMark J. Titorenko2012-05-045-0/+56
| |
* | Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactorJeremy Kemper2012-05-041-1/+1
|\ \ | | | | | | Use Hash#fetch instead of has_key? check
| * | Use Hash#fetch instead of has_key? checkCarlos Antonio da Silva2012-05-041-1/+1
| | |
* | | Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-testsAndrew White2012-05-041-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. Titorenko2012-05-041-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_wrappingJosé Valim2012-05-042-4/+18
| | | | | | | | specify a role for identifying accessible attributes when wrapping params
* | Merge pull request #5808 from avakhov/assert-template-layout-improveJosé Valim2012-05-043-6/+60
|\ \ | | | | | | Assert template layout improve
| * | Improve assert_template layout checkingAlexey Vakhov2012-05-042-3/+30
| | |
| * | Fix assert_template :layout => nil assertionAlexey Vakhov2012-05-042-2/+17
| | |
| * | Fix assert_template assertion with :layout optionAlexey Vakhov2012-05-043-1/+13
|/ /
* | Merge pull request #6160 from ↵Aaron Patterson2012-05-043-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 checkingCarlos Antonio da Silva2012-05-043-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 Dev2012-05-041-1/+1
| | |
* | | session creation methods to a moduleAaron Patterson2012-05-043-24/+11
| | |
* | | Merge pull request #6154 from shaliko/patch-1Vijay Dev2012-05-041-1/+6
|\ \ \ | |/ / |/| | Update documentation for button_to.
| * | Update documentation for button_to.Shalva Usubov2012-05-041-1/+6
| |/
* | update invalid partial error message as per ↵Vijay Dev2012-05-041-4/+4
| | | | | | | | 04202a3f8d66c0675eac41fbf63309f4be356e81
* | Merge pull request #6159 from marcandre/fix_bad_partial_error_messVijay Dev2012-05-041-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 Lafortune2012-05-041-2/+2
| | |
* | | create a request session in the cookie storesAaron Patterson2012-05-041-0/+8
| | |
* | | create a request::session object in the memecache store middlewareAaron Patterson2012-05-041-0/+10
|/ /
* | Merge branch 'master' into sessionAaron Patterson2012-05-0467-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 methodsJon Leighton2012-05-042-142/+40
| |
| * Merge pull request #6153 from carlosantoniodasilva/queue-consumerJosé Valim2012-05-048-23/+89
| |\ | | | | | | Configurable queue consumer
| | * Add some docs and changelog entryCarlos Antonio da Silva2012-05-043-13/+21
| | |
| | * Allow overriding exception handling in threaded consumerCarlos Antonio da Silva2012-05-042-1/+24
| | |
| | * Allow configuring a different queue consumerCarlos Antonio da Silva2012-05-044-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/docrailsVijay Dev2012-05-0420-377/+150
| |\ \ | | |/ | |/|
| | * Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| | |
| | * mention database mapping in getting started guideOscar Del Ben2012-05-041-1/+4
| | |
| | * Remove vestiges of the http_only! config from configuring guideCarlos Antonio da Silva2012-05-031-8/+0
| | |
| | * Update command line guideOscar Del Ben2012-05-031-4/+2
| | |
| | * I found it strange that this guide is redirecting questions to a specific ↵Paul McMahon2012-05-031-2/+1
| | | | | | | | | | | | person. Heiko Webers' (@hawe) last blog post is a year and a half old, so it's not obvious that he's still active with Rails security. If he is, feel free to revert.
| | * Corrected the name of the module that should be included to get the url helpers.Anuj Dutta2012-05-031-1/+1
| | |
| | * TypoOscar Del Ben2012-05-021-1/+1
| | |
| | * Mention mac os x installation tools on getting started guideOscar Del Ben2012-05-021-1/+4
| | |
| | * Remove tags from getting started guide and adapt some of the content toOscar Del Ben2012-05-023-216/+7
| | | | | | | | | | | | the new guide
| | * Rewrite refactoring section in getting started guideOscar Del Ben2012-05-024-77/+34
| | |
| | * Rewrite comments action in getting started guideOscar Del Ben2012-05-023-21/+26
| | |
| | * Changed code examples to have a consistent code styling [ci skip]Ayrton De Craene2012-05-021-33/+33
| | |
| | * Add note about image_tag('') issue in Asset Pipeline guide (see rails issue ↵Michael Pearson2012-05-021-0/+2
| | | | | | | | | | | | #3080)
| | * Fix example url in text helperAlexey Vakhov2012-05-021-1/+1
| | |
| | * Fix form tag with non GET/POST method exampleAlexey Vakhov2012-05-021-1/+1
| | |
| | * Documentation fix in options_for_select helper. Fixed display errors caused ↵Rodrigo Pavano2012-05-011-9/+26
| | | | | | | | | | | | by mixing Ruby and HTML code inside the same pre tag [ci skip]
| | * Add empty rows to improve readability. [ci skip]Edward Tsech2012-05-011-0/+2
| | |
| | * Add few lines to describe how aggregation part caching works. [ci skip]Edward Tsech2012-05-011-0/+4
| | |
| | * simpler wording and explanationsHrvoje Šimić2012-05-012-11/+11
| | |
| | * Lowercase.Ben Pickles2012-05-011-1/+1
| | |
| * | Merge pull request #5650 from sekrett/masterVijay Dev2012-05-041-1/+1
| |\ \ | | | | | | | | Documentation fix: Change the example for habtm association to use proc according to changelog
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 04:56:38 +0000