aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Revert "Merge pull request #5494 from ↵Jon Leighton2012-05-054-43/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge" This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing changes made to 58a49875df63729f07a9a81d1ee349087d258df5.
* | | | | | | Merge pull request #5494 from ↵Jon Leighton2012-05-054-6/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armstrjare/active_record_relation_keep_association_join_context_on_merge ActiveRecord::Relation - maintain context of joined associations on merges
| * | | | | | | Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-044-6/+43
| | | | | | | |
* | | | | | | | Make RedCloth not convert double hyphens to emdashes. Closes #5292Vijay Dev2012-05-061-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/checkboxesJosé Valim2012-05-052-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | check checkboxes with array of strings as :checked option
| * | | | | | | | check checkboxes with array of strings as :checked optionVasiliy Ermolovich2012-05-052-1/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | some corrections in the AR query guide [ci skip]Vijay Dev2012-05-051-13/+15
| | | | | | | |
* | | | | | | | Merge pull request #6175 from mhfs/guide_take_first_lastVijay Dev2012-05-051-8/+42
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update `first`, `last` and `take` in guides
| * | | | | | | Update `first`, `last` and `take` in guidesMarcelo Silveira2012-05-051-8/+42
|/ / / / / / /
* | | | | | | Try to convert object passed to debug_hash to hashPiotr Sarnacki2012-05-051-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_missingJosé Valim2012-05-056-6/+24
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Respond to missing
| * | | | | | Use respond_to_missing for TimeWithZoneMarc-Andre Lafortune2012-05-052-3/+4
| | | | | | |
| * | | | | | Use respond_to_missing? for CharsMarc-Andre Lafortune2012-05-052-2/+11
| | | | | | |
| * | | | | | Use respond_to_missing? for OrderedOptionsMarc-Andre Lafortune2012-05-052-1/+9
| | | | | | |
* | | | | | | Give more detailed instructions in script/rails in enginePiotr Sarnacki2012-05-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #4894
* | | | | | | Duplicate column_defaults properly (closes #6115)Piotr Sarnacki2012-05-043-2/+12
| | | | | | |
* | | | | | | Change unless + ! into ifPiotr Sarnacki2012-05-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #3713 from kf8a/masterAaron Patterson2012-05-042-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 InfinitySven Bohm2011-11-212-2/+19
| | | | | | | |
* | | | | | | | need to dup the default options so that mutations will not impact usAaron Patterson2012-05-041-1/+1
| | | | | | | |
* | | | | | | | make sure the superclass matches so load order does not matterAaron Patterson2012-05-042-2/+2
| | | | | | | |
* | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 05:52:51 +0000