aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change the behavior of route defaultsAndrew White2013-01-157-11/+99
* Add support for other types of routing constraintsAndrew White2013-01-155-113/+237
* Ensure port is set when passed via the process methodAndrew White2013-01-153-1/+58
* Raise correct exception now Journey is integrated.Andrew White2013-01-153-9/+12
* Revert "Merge pull request #8930 from cordawyn/ordered_railties"Carlos Antonio da Silva2013-01-152-5/+1
* Merge pull request #8930 from cordawyn/ordered_railtiesCarlos Antonio da Silva2013-01-152-1/+5
|\
| * 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
* | Improve mysql database tasks handling to ensure we always rescue from an exce...Carlos Antonio da Silva2013-01-151-9/+13
* | Revert "Merge pull request #8942 from yahonda/tested_only_with_mysql"Carlos Antonio da Silva2013-01-151-4/+0
* | Merge pull request #8949 from joneslee85/patch-2Xavier Noria2013-01-151-2/+2
|\ \
| * | 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 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]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 failuresYasuo Honda2013-01-151-0/+4
| |/
* | Merge pull request #8939 from senny/to_partial_path_test_to_prevent_regressionsRafael Mendonça França2013-01-142-0/+8
|\ \
| * | 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 option to :selected, in line with other select helpersColin Burn-Murdoch2013-01-144-4/+57
* | | Revert benchmark helper regression. Use a #capture within a #benchmarkJeremy Kemper2013-01-143-39/+3
| |/ |/|
* | Test to allow Range including DateTime and DateTime::Infinitygsphanikumar2013-01-141-0/+6
* | 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 renderJosé Mota2013-01-122-4/+53
* | | 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::ModelAttila Domokos2013-01-121-0/+6
| |/ /
* | | Merge pull request #8925 from colinbm/date_select_valueSteve Klabnik2013-01-133-1/+26
|\ \ \ | | |/ | |/|
| * | 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
* | 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
* Bring back "database already exists" messages when running rake tasksCarlos Antonio da Silva2013-01-127-20/+47
* Merge pull request #8907 from rubys/masterRafael Mendonça França2013-01-111-1/+2
|\
| * Fix regression introduced in pull request 8812Sam Ruby2013-01-111-1/+2
|/
* Merge pull request #8896 from NARKOZ/patch-5Rafael Mendonça França2013-01-111-2/+2
|\
| * remove_possible_method -> remove_methodNihad Abbasov2013-01-111-2/+2
|/
* Add changelog entry for scaffold generator and jbuilder changesCarlos Antonio da Silva2013-01-111-0/+9
* Merge pull request #8882 from goshakkk/clearer-conditionalCarlos Antonio da Silva2013-01-111-3/+3
|\
| * 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
|\ \
| * | 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
|\ \ \
| * | | Test nested fields with AssociationProxy mockup & fix AssociationProxy suppor...virusman2012-12-272-1/+24
* | | | Merge pull request #8568 from inossidabile/fix-in_clause_lengthJon Leighton2013-01-113-8/+13
|\ \ \ \
| * | | | Eager loading made to use relation's in_clause_length instead of host's one (...Boris Staal2012-12-203-8/+13
* | | | | Merge pull request #8855 from dylanahsmith/parse-non-object-json-paramsJeremy Kemper2013-01-103-2/+13
|\ \ \ \ \