aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove i18n symbol dependencyChris McGrath2013-01-173-6/+12
* Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_classCarlos Antonio da Silva2013-01-163-9/+58
* Merge pull request #8964 from mattdbridges/specify-log-to-clearCarlos Antonio da Silva2013-01-163-5/+24
|\
| * clear specific logs when using rake log:clearMatt Bridges2013-01-163-5/+24
* | Merge pull request #8967 from senny/add_interceptor_to_am_docXavier Noria2013-01-161-0/+20
|\ \
| * | document Intercepters in ActionMailer guideYves Senn2013-01-161-0/+20
* | | Merge pull request #8965 from colinbm/date_select_valueCarlos Antonio da Silva2013-01-162-2/+65
|\ \ \ | |/ / |/| |
| * | Fix date_select :selected option so you can pass it nilColin Burn-Murdoch2013-01-162-2/+65
|/ /
* | Merge pull request #8959 from vitorbaptista/masterRafael Mendonça França2013-01-163-3/+6
|\ \
| * | Don't rely on Hash key's orderingVitor Baptista2013-01-163-3/+6
|/ /
* | Remove warnings: "(...) interpreted as grouped expression"Carlos Antonio da Silva2013-01-161-2/+2
* | Merge pull request #8963 from asanghi/regress_8631Andrew White2013-01-161-0/+21
|\ \ | |/ |/|
| * adding regression test in master for #8631Aditya Sanghi2013-01-161-0/+21
|/
* Merge pull request #8955 from burns/source_annotationRafael Mendonça França2013-01-153-16/+76
|\
| * allow :dirs option for .enumerateBrian D. Burns2013-01-153-6/+60
| * use case statementBrian D. Burns2013-01-151-10/+16
* | Merge pull request #8958 from balexand/strong_parameters_exception_handlingRafael Mendonça França2013-01-154-16/+14
|\ \
| * | strong parameters exception handlingBrian Alexander2013-01-154-16/+14
* | | Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-153-2/+10
|\ \ \ | |/ / |/| |
| * | Remove header bloat introduced by BestStandardsSupport middlewareEdward Anderson2013-01-153-2/+10
|/ /
* | Merge pull request #8954 from davetoxa/patch-1Carlos Antonio da Silva2013-01-151-1/+0
|\ \
| * | Update guides/source/active_record_validations.mdAnton Cherepanov2013-01-151-1/+0
* | | Merge pull request #8940 from adomokos/adding_tests_for_changed_attributesCarlos Antonio da Silva2013-01-151-1/+12
|\ \ \ | |_|/ |/| |
| * | Cleaning up ActiveModel::Dirty testsAttila Domokos2013-01-151-1/+12
* | | 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