Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | `CollectionAssociation#empty?` respects newly builded records | Yves Senn | 2013-01-13 | 3 | -1/+19 |
| | |||||
* | Fix AR tests due to Mysql constant not being defined | Carlos Antonio da Silva | 2013-01-12 | 3 | -7/+5 |
| | |||||
* | Deprecate `Rails::Generators::ActiveModel#update_attributes` | Carlos Antonio da Silva | 2013-01-12 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | Deprecate #update_attributes in favor of `#update`. ORMs that implement `Generators::ActiveModel#update_attributes` should change to `#update`. Scaffold controller generators should change calls like: @orm_instance.update_attributes(...) to: @orm_instance.update(...) This goes along with the addition of `ActiveRecord::Base#update`, introduced in cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4. | ||||
* | Bring back "database already exists" messages when running rake tasks | Carlos Antonio da Silva | 2013-01-12 | 7 | -20/+47 |
| | | | | | | | | | | When running tasks such "rake db:setup", instead of showing messages like "db_development already exists", it was showing a big stack trace and a message "Couldn't create database for ..." with the configuration options, a very confusing message with a big trace. This brings back the functionality present in 3-2, showing the same message. | ||||
* | Merge pull request #8907 from rubys/master | Rafael Mendonça França | 2013-01-11 | 1 | -1/+2 |
|\ | | | | | Fix regression introduced in pull 8812 | ||||
| * | Fix regression introduced in pull request 8812 | Sam Ruby | 2013-01-11 | 1 | -1/+2 |
|/ | | | | See https://github.com/rails/rails/pull/8812#commitcomment-2416514 | ||||
* | Merge pull request #8896 from NARKOZ/patch-5 | Rafael Mendonça França | 2013-01-11 | 1 | -2/+2 |
|\ | | | | | remove_possible_method -> remove_method | ||||
| * | remove_possible_method -> remove_method | Nihad Abbasov | 2013-01-11 | 1 | -2/+2 |
|/ | | | | Date#to_time and Date#xmlschema methods defined in Ruby 1.9.3 | ||||
* | Add changelog entry for scaffold generator and jbuilder changes | Carlos Antonio da Silva | 2013-01-11 | 1 | -0/+9 |
| | | | | | | | Introduced in 3bfd99defb559af0b017ee920ca714aa1e367fdd. Related to #8840. [ci skip] | ||||
* | Merge pull request #8882 from goshakkk/clearer-conditional | Carlos Antonio da Silva | 2013-01-11 | 1 | -3/+3 |
|\ | | | | | Clearer conditional in constraint match check | ||||
| * | clearer conditional in constraint match check | Gosha Arinich | 2013-01-10 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #8866 from adomokos/adding_more_tests_to_errors_test | Carlos Antonio da Silva | 2013-01-11 | 1 | -0/+53 |
|\ \ | | | | | | | Adding tests to cover untested methods in errors_tests.rb | ||||
| * | | Covering untested methods for ActiveModel::Errors | Attila Domokos | 2013-01-10 | 1 | -0/+53 |
| | | | |||||
* | | | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fix | Jon Leighton | 2013-01-11 | 2 | -1/+24 |
|\ \ \ | | | | | | | | | Fixed nested fields bug when called with AssociationProxy | ||||
| * | | | Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵ | virusman | 2012-12-27 | 2 | -1/+24 |
| | | | | | | | | | | | | | | | | support in form helper | ||||
* | | | | Merge pull request #8568 from inossidabile/fix-in_clause_length | Jon Leighton | 2013-01-11 | 3 | -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 Staal | 2012-12-20 | 3 | -8/+13 |
| | | | | | | | | | | | | | | | | | | | | (fixes #8474) | ||||
* | | | | | Merge pull request #8855 from dylanahsmith/parse-non-object-json-params | Jeremy Kemper | 2013-01-10 | 3 | -2/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix json params parsing regression for non-object JSON content. | ||||
| * | | | | | Fix json params parsing regression for non-object JSON content. | Dylan Smith | 2013-01-11 | 3 | -2/+13 |
|/ / / / / | | | | | | | | | | | | | | | | Fixes #8845. | ||||
* | | | | | All green with Ruby 2.0 :green_heart: | Rafael Mendonça França | 2013-01-11 | 1 | -3/+0 |
| | | | | | |||||
* | | | | | Use thor master to make rails work with Ruby 2.0 | Rafael Mendonça França | 2013-01-11 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | thread_safe is a dependency of active_support | Rafael Mendonça França | 2013-01-11 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #8887 from rwz/controller-scaffold-codestyle | Rafael Mendonça França | 2013-01-10 | 3 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Controller scaffold codestyle | ||||
| * | | | | | More consistent quotes in scaffold generator | Pavel Pravosud | 2013-01-11 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Changed if ! to unless | Pavel Pravosud | 2013-01-11 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #8886 from rwz/specify-jbuilder-version | Guillermo Iguaran | 2013-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Specified jbuilder version | ||||
| * | | | | | Specified jbuilder version | Pavel Pravosud | 2013-01-11 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #8884 from mattdbridges/array-access-doc-fixes | Guillermo Iguaran | 2013-01-10 | 1 | -4/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Updating Array access docs more consistent | ||||
| * | | | | Updating Array access docs more consistent | Matt Bridges | 2013-01-10 | 1 | -4/+4 |
|/ / / / | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #8869 from goshakkk/guides-asset-pipeline-tilt | Guillermo Iguaran | 2013-01-10 | 1 | -1/+25 |
|\ \ \ \ | | | | | | | | | | | Add asset pipeline guides section on implementing & registering own engines | ||||
| * | | | | add asset pipeline guides section on implementing & registering own engines | Gosha Arinich | 2013-01-10 | 1 | -1/+25 |
| | | | | | |||||
* | | | | | Relax bundler dep until 1.3.0 is actually released. | Jeremy Kemper | 2013-01-10 | 2 | -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 Hansson | 2013-01-10 | 6 | -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_guide | Guillermo Iguaran | 2013-01-10 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Mention performance test extraction in 4.0 guide | ||||
| * | | | | | mention performance test extraction in 4.0 guide | Yves Senn | 2013-01-10 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #8876 from senny/extract_performance_tests | Guillermo Iguaran | 2013-01-10 | 33 | -1640/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Extract ActionDispatch::PerformanceTest | ||||
| * | | | | | remove the rails guide on performance testing | Yves Senn | 2013-01-10 | 3 | -692/+0 |
| | | | | | | |||||
| * | | | | | remove performance tests from the default stack | Yves Senn | 2013-01-10 | 10 | -47/+5 |
| | | | | | | |||||
| * | | | | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 21 | -901/+15 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #8821 from jamis/master | Rafael Mendonça França | 2013-01-10 | 2 | -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 level | Jamis Buck | 2013-01-08 | 2 | -7/+3 |
| | | | | | |||||
* | | | | | Merge pull request #8863 from zires/dev | Carlos Antonio da Silva | 2013-01-10 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Remove redundant double quotation marks [ci skip] | ||||
| * | | | | Remove redundant double quotation marks | zires | 2013-01-10 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | fire a notification when the request stops / starts | Aaron Patterson | 2013-01-09 | 2 | -2/+88 |
| | | | | |||||
* | | | | adding missing requires | Aaron Patterson | 2013-01-09 | 3 | -1/+12 |
| | | | | |||||
* | | | | extract logger and development checks to methods | Aaron Patterson | 2013-01-09 | 1 | -6/+16 |
| | | | | |||||
* | | | | adding start / finish on the instrumenter, adding tests for the class | Aaron Patterson | 2013-01-09 | 2 | -6/+67 |
| | | | | |||||
* | | | | Merge pull request #8859 from tehgeekmeister/master | Vijay Dev | 2013-01-09 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix a typo in a test. | ||||
| * | | | | s/messqage/message/ in message_encryptor_test.rb | Ezekiel Smithburg | 2013-01-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #8848 from Irio/master | Carlos Antonio da Silva | 2013-01-09 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Set default value to ActiveModel::Validator initializer attribute |