aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8930 from cordawyn/ordered_railtiesCarlos Antonio da Silva2013-01-152-1/+5
|\ | | | | rake railties:install:migrations respects the order of railties
| * rake railties:install:migrations respects the order of railtiesSlava Kravchenko2013-01-142-1/+5
| |
* | Revert "log at debug level what line caused the redirect_to"Carlos Antonio da Silva2013-01-151-1/+0
| | | | | | | | | | | | | | | | This reverts commit 3fa00070047b5d019d39e691598ee2890283d052. Reason: This message is usually not accurate and annoying: Redirected by ~/.rbenv/versions/1.9.3-p327-perf/lib/ruby/1.9.1/logger.rb:371:in `add'`
* | Improve mysql database tasks handling to ensure we always rescue from an ↵Carlos Antonio da Silva2013-01-151-9/+13
| | | | | | | | | | | | | | | | | | | | exception We were previously rescuing "nil" when no exception class was found. This does work in 1.9.3, but does not in 2.0, raising an exception asking for a class or module to be given to the rescue clause. Thanks @yahonda for catching this.
* | Revert "Merge pull request #8942 from yahonda/tested_only_with_mysql"Carlos Antonio da Silva2013-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 1fc294f988e93ac59057a16b0e44b9cf93af9720, reversing changes made to fb9ac47c286fbdfe05263d4d0346e50892090603. Reason: these tests should run fine independent of database, since they should only take into account the configuration options. The problem was related to a change in the way "nil" is handled by the rescue clause, in Ruby 2.0 it raises an exception asking for class or module, in 1.9 it passes.
* | Merge pull request #8949 from joneslee85/patch-2Xavier Noria2013-01-151-2/+2
|\ \ | | | | | | ActiveRecord <-> Active Record [ci skip]
| * | ActiveRecord <-> Active Record [ci skip]Trung Lê2013-01-151-2/+2
|/ /
* | Merge pull request #8946 from reednj77/rack-cache-headersDavid Heinemeier Hansson2013-01-141-6/+6
|\ \ | | | | | | Account for ignored cookie set by turbolinks
| * | Account for ignored cookie set by turbolinksNick Reed2013-01-141-6/+6
| | |
* | | Merge pull request #8947 from joneslee85/patch-1Guillermo Iguaran2013-01-141-1/+1
|\ \ \ | |/ / |/| | Use Rails 4 find_by in README [ci skip]
| * | Use Rails 4 find_by in README [ci skip]Trung Lê2013-01-151-1/+1
|/ /
* | Merge pull request #8942 from yahonda/tested_only_with_mysqlRafael Mendonça França2013-01-141-0/+4
|\ \ | | | | | | Address test_create_when_database_exists_outputs_info_to_stderr failures
| * | Address test_create_when_database_exists_outputs_info_to_stderr failuresYasuo Honda2013-01-151-0/+4
| |/ | | | | | | | | When tested with ruby-2.0.0-rc1 `rake test` executes this test even if the target adapter is not mysql nor mysql2.
* | Merge pull request #8939 from senny/to_partial_path_test_to_prevent_regressionsRafael Mendonça França2013-01-142-0/+8
|\ \ | | | | | | test case for ActiveModel::Conversion#to_partial_path and namespaced models
| * | test for ActiveModel::Conversion#to_partial_path and namespaced modelsYves Senn2013-01-142-0/+8
| | |
* | | Merge pull request #8938 from colinbm/date_select_valueSteve Klabnik2013-01-144-4/+57
|\ \ \ | |/ / |/| | Rename :value to :selected for date_select, and add missing tests/docs
| * | Rename :value option to :selected, in line with other select helpersColin Burn-Murdoch2013-01-144-4/+57
| | | | | | | | | | | | | | | Add tests for time & datetime. Add documentation.
* | | Revert benchmark helper regression. Use a #capture within a #benchmarkJeremy Kemper2013-01-143-39/+3
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | block. Breaks benchmark calls that return non-String values otherwise. Revert "add benchmark helper that works in erb" This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de. Conflicts: actionpack/lib/action_view/helpers.rb actionpack/lib/action_view/helpers/benchmark_helper.rb actionpack/test/template/benchmark_helper_test.rb
* | Test to allow Range including DateTime and DateTime::Infinitygsphanikumar2013-01-141-0/+6
| | | | | | | | Closes #8587
* | Merge pull request #8916 from josemota/collection-with-blockRafael Mendonça França2013-01-132-4/+53
|\ \ | | | | | | | | | | | | Collection radio buttons and collection check boxes through FormBuilder render the provided block. Closes #8897
| * | Collection radio buttons and collection check boxes through FormBuilder renderJosé Mota2013-01-122-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | the provided block. In the case of having a form_for method being called, the block for each collection would not be passed and thus the result expected was always the same. This patch passes the block to the original method like it would be assumed.
* | | Add regression test to #8907Rafael Mendonça França2013-01-141-0/+31
| | |
* | | Merge pull request #8917 from adomokos/adding_more_tests_to_activemodel_modelRafael Mendonça França2013-01-131-0/+6
|\ \ \ | | | | | | | | Adding tests for ActiveModel::Model
| * | | Adding tests for ActiveModel::ModelAttila Domokos2013-01-121-0/+6
| |/ / | | | | | | | | | | | | | | | * Verifying persisted? is false when Model initialized * Passing nil to Model should not blow up * Changing test name to the one suggested in pull request comment
* | | Merge pull request #8925 from colinbm/date_select_valueSteve Klabnik2013-01-133-1/+26
|\ \ \ | | |/ | |/| Allow to override the value on date_select
| * | Allow value to be set on date_selectColin Burn-Murdoch2013-01-133-1/+26
|/ /
* | Remove WIP from Working With JavaScript Guide.Steve Klabnik2013-01-131-1/+0
| | | | | | | | Now that we've fixed the fibs example, this is good to go.
* | Associaton -> AssociationSteve Klabnik2013-01-131-2/+2
|/
* Fix AR tests due to Mysql constant not being definedCarlos Antonio da Silva2013-01-123-7/+5
|
* Deprecate `Rails::Generators::ActiveModel#update_attributes`Carlos Antonio da Silva2013-01-122-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 tasksCarlos Antonio da Silva2013-01-127-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/masterRafael Mendonça França2013-01-111-1/+2
|\ | | | | Fix regression introduced in pull 8812
| * Fix regression introduced in pull request 8812Sam Ruby2013-01-111-1/+2
|/ | | | See https://github.com/rails/rails/pull/8812#commitcomment-2416514
* Merge pull request #8896 from NARKOZ/patch-5Rafael Mendonça França2013-01-111-2/+2
|\ | | | | remove_possible_method -> remove_method
| * remove_possible_method -> remove_methodNihad Abbasov2013-01-111-2/+2
|/ | | | Date#to_time and Date#xmlschema methods defined in Ruby 1.9.3
* Add changelog entry for scaffold generator and jbuilder changesCarlos Antonio da Silva2013-01-111-0/+9
| | | | | | | Introduced in 3bfd99defb559af0b017ee920ca714aa1e367fdd. Related to #8840. [ci skip]
* Merge pull request #8882 from goshakkk/clearer-conditionalCarlos Antonio da Silva2013-01-111-3/+3
|\ | | | | Clearer conditional in constraint match check
| * clearer conditional in constraint match checkGosha Arinich2013-01-101-3/+3
| |
* | Merge pull request #8866 from adomokos/adding_more_tests_to_errors_testCarlos Antonio da Silva2013-01-111-0/+53
|\ \ | | | | | | Adding tests to cover untested methods in errors_tests.rb
| * | Covering untested methods for ActiveModel::ErrorsAttila Domokos2013-01-101-0/+53
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 09:07:03 +0000