aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fixJon Leighton2013-01-112-1/+24
|\ \ \ | | | | | | | | Fixed nested fields bug when called with AssociationProxy
| * | | Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵virusman2012-12-272-1/+24
| | | | | | | | | | | | | | | | support in form helper
* | | | Merge pull request #8568 from inossidabile/fix-in_clause_lengthJon Leighton2013-01-113-8/+13
|\ \ \ \ | | | | | | | | | | Correct source for in_clause_length for eager loading (Fix for #8474)
| * | | | Eager loading made to use relation's in_clause_length instead of host's one ↵Boris Staal2012-12-203-8/+13
| | | | | | | | | | | | | | | | | | | | (fixes #8474)
* | | | | Merge pull request #8855 from dylanahsmith/parse-non-object-json-paramsJeremy Kemper2013-01-103-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Fix json params parsing regression for non-object JSON content.
| * | | | | Fix json params parsing regression for non-object JSON content.Dylan Smith2013-01-113-2/+13
|/ / / / / | | | | | | | | | | | | | | | Fixes #8845.
* | | | | All green with Ruby 2.0 :green_heart:Rafael Mendonça França2013-01-111-3/+0
| | | | |
* | | | | Use thor master to make rails work with Ruby 2.0Rafael Mendonça França2013-01-111-0/+2
| | | | |
* | | | | thread_safe is a dependency of active_supportRafael Mendonça França2013-01-111-1/+0
| | | | |
* | | | | Merge pull request #8887 from rwz/controller-scaffold-codestyleRafael Mendonça França2013-01-103-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Controller scaffold codestyle
| * | | | | More consistent quotes in scaffold generatorPavel Pravosud2013-01-112-3/+3
| | | | | |
| * | | | | Changed if ! to unlessPavel Pravosud2013-01-111-1/+1
| | | | | |
* | | | | | Merge pull request #8886 from rwz/specify-jbuilder-versionGuillermo Iguaran2013-01-101-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Specified jbuilder version
| * | | | | Specified jbuilder versionPavel Pravosud2013-01-111-1/+1
|/ / / / /
* | | | | Merge pull request #8884 from mattdbridges/array-access-doc-fixesGuillermo Iguaran2013-01-101-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Updating Array access docs more consistent
| * | | | Updating Array access docs more consistentMatt Bridges2013-01-101-4/+4
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #8869 from goshakkk/guides-asset-pipeline-tiltGuillermo Iguaran2013-01-101-1/+25
|\ \ \ \ | | | | | | | | | | Add asset pipeline guides section on implementing & registering own engines
| * | | | add asset pipeline guides section on implementing & registering own enginesGosha Arinich2013-01-101-1/+25
| | | | |
* | | | | Relax bundler dep until 1.3.0 is actually released.Jeremy Kemper2013-01-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'" This reverts commit e00b8ecf1ad8984b760f12e61247820613aec4ee. Revert "Use bundler --pre for travis builds" This reverts commit 4d240ec20a70122b7e69c790a37d2be14e1ff038.
* | | | | Include jbuilder by default and rely on its scaffold generator to show json ↵David Heinemeier Hansson2013-01-106-99/+14
| | | | | | | | | | | | | | | | | | | | API. The default scaffold will now just create HTML if the user actively opts out of jbuilder
* | | | | Merge pull request #8878 from senny/add_performance_test_extraction_to_guideGuillermo Iguaran2013-01-101-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Mention performance test extraction in 4.0 guide
| * | | | | mention performance test extraction in 4.0 guideYves Senn2013-01-101-0/+1
|/ / / / /
* | | | | Merge pull request #8876 from senny/extract_performance_testsGuillermo Iguaran2013-01-1033-1640/+20
|\ \ \ \ \ | | | | | | | | | | | | Extract ActionDispatch::PerformanceTest
| * | | | | remove the rails guide on performance testingYves Senn2013-01-103-692/+0
| | | | | |
| * | | | | remove performance tests from the default stackYves Senn2013-01-1010-47/+5
| | | | | |
| * | | | | extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-1021-901/+15
| | |_|_|/ | |/| | |
* | | | | Merge pull request #8821 from jamis/masterRafael Mendonça França2013-01-102-7/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Evaluate view_cache_dependencies at the instance level Conflicts: actionpack/lib/action_controller/caching.rb
| * | | | evaluate the dependency blocks at the instance level, not class levelJamis Buck2013-01-082-7/+3
| | | | |
* | | | | Merge pull request #8863 from zires/devCarlos Antonio da Silva2013-01-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Remove redundant double quotation marks [ci skip]
| * | | | Remove redundant double quotation markszires2013-01-101-1/+1
|/ / / /
* | | | fire a notification when the request stops / startsAaron Patterson2013-01-092-2/+88
| | | |
* | | | adding missing requiresAaron Patterson2013-01-093-1/+12
| | | |
* | | | extract logger and development checks to methodsAaron Patterson2013-01-091-6/+16
| | | |
* | | | adding start / finish on the instrumenter, adding tests for the classAaron Patterson2013-01-092-6/+67
| | | |
* | | | Merge pull request #8859 from tehgeekmeister/masterVijay Dev2013-01-091-2/+2
|\ \ \ \ | | | | | | | | | | Fix a typo in a test.
| * | | | s/messqage/message/ in message_encryptor_test.rbEzekiel Smithburg2013-01-091-2/+2
| | | | |
* | | | | Merge pull request #8848 from Irio/masterCarlos Antonio da Silva2013-01-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Set default value to ActiveModel::Validator initializer attribute
| * | | | | Set default value to ActiveModel::Validator initializer attributeIrio Irineu Musskopf Junior2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Makes it easier to test its objects.
* | | | | | Merge pull request #8849 from mattdbridges/contributing_to_railsCarlos Antonio da Silva2013-01-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding mention about single-line blocks in Contributing to Rails [ci skip]
| * | | | | | adding small mention one single line blocks in contributing to railsMatt Bridges2013-01-091-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #8839 from mattdbridges/clarify_chdirRafael Mendonça França2013-01-091-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Clarify Dir.chdir definition
| * | | | | use multiline do-end blocks and rearrange definition for clarityMatt Bridges2013-01-091-5/+5
| | | | | |
* | | | | | Merge pull request #8842 from nthj/patch-1Rafael Mendonça França2013-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix typo in deprecation warning
| * | | | | Fix typo in deprecation warningNathaniel Jones2013-01-091-1/+1
|/ / / / /
* | | | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritanceSantiago Pastorino2013-01-082-5/+26
|\ \ \ \ \ | | | | | | | | | | | | Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372]
| * | | | | Revert cb3181e - no longer required.Mark J. Titorenko2013-01-081-2/+0
| | | | | |
| * | | | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from ↵Mark J. Titorenko2013-01-081-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | Rack::Session::Abstract::ID rather than Rack::Session::Cookie.
* | | | | | Merge pull request #8833 from diogomafra/release_notesCarlos Antonio da Silva2013-01-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correcting the command 'rake rails:update:bin' in the release notes. [ci skip]
| * | | | | | Correcting the command 'rake rails:update:bin' in the release notes.[ci skip]Diogo Mafra2013-01-081-1/+1
|/ / / / / /
* | | | | | Merge pull request #8823 from acapilleri/target_reflection_has_associated_recordCarlos Antonio da Silva2013-01-081-5/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor target_reflection_has_associated_record?
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:28:11 +0000