aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #19502 from kaspth/assert-select-failure-outputRafael Mendonça França2015-03-241-0/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Update 4.2 Release notes with more assert_select information.Kasper Timm Hansen2015-03-241-0/+24
* | | | | | | | | | | Merge pull request #19499 from swalkinshaw/patch-1Arthur Nogueira Neves2015-03-241-7/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update ActiveSupport::Subscriber docsScott Walkinshaw2015-03-241-7/+2
* | | | | | | | | | | Add changelog entry for #19271Arthur Neves2015-03-241-0/+7
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding"Rafael Mendonça França2015-03-241-19/+19
* | | | | | | | | | Merge pull request #19500 from ccutrer/dry_sti_subclass_findingRafael Mendonça França2015-03-241-19/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | DRY up STI subclass logicCody Cutrer2015-03-241-19/+19
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19452 from pinglamb/fix-referencing-wrong-alias-when-join...Carlos Antonio da Silva2015-03-243-1/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix referencing wrong aliases while joining tables of has many throughpinglamb2015-03-223-1/+19
* | | | | | | | | | Merge pull request #19493 from larskanis/add_infinity_testYves Senn2015-03-241-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | PostgreSQL, Add test case for "Infinity" string assignment to float columns.Lars Kanis2015-03-221-0/+9
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #19488 from yui-knk/fix/comment2Yves Senn2015-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Remove unacceptable method nameyui-knk2015-03-241-1/+1
* | | | | | | | | | | Merge pull request #19491 from tgxworld/fix_incorrect_descriptionYves Senn2015-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix incorrect description for `assert_nothing_raised`.Guo Xiang Tan2015-03-241-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #19485 from tgxworld/small_doc_fixRafael Mendonça França2015-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Small doc fix. [CI SKIP]Guo Xiang Tan2015-03-241-1/+1
* | | | | | | | | | | Merge pull request #19481 from davidcornu/activesupport/normalize-to-sentenceArthur Nogueira Neves2015-03-232-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make sure Array#to_sentence always returns a StringDavid Cornu2015-03-232-1/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #19482 from mperham/masterRafael Mendonça França2015-03-232-7/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Pass wrapped class name to Sidekiq for logging purposesMike Perham2015-03-232-7/+22
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19475 from tgxworld/no_one_has_to_suck_anymoreRafael Mendonça França2015-03-232-13/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove alias for `i_suck_and_my_tests_are_order_dependent`.Guo Xiang Tan2015-03-242-13/+0
|/ / / / / / / / /
* | | | | | | | | Fix failing tests for #19474Andrew White2015-03-231-2/+2
* | | | | | | | | Fix ActionDispatch::PublicExceptions returning string rack statusRyan Tomayko2015-03-231-2/+2
* | | | | | | | | Merge pull request #19473 from nerdinand/duration-to_i-documentationYves Senn2015-03-231-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation for Duration#to_i for clarificationnerdinand2015-03-231-0/+24
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19471 from nerdinand/remove-activesupport-integer-example...Yves Senn2015-03-232-30/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove reference to Numeric#from_now, as it is no longer supportednerdinand2015-03-232-30/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19449 from Gaurav2728/gaurav-unavailable_linkRafael Mendonça França2015-03-234-7/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove old unavailable link with relevant fixGaurav Sharma2015-03-234-7/+4
* | | | | | | | | | Merge pull request #19469 from Gaurav2728/gaurav-mysql_missing_linksRafael Mendonça França2015-03-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | update mysql link that has been replacedGaurav Sharma2015-03-231-1/+1
|/ / / / / / / / /
* | | | | | | | | Provide a more truthful #inspectMatthew Draper2015-03-231-0/+4
* | | | | | | | | Make sure to persist a newly-nil serialized valueMatthew Draper2015-03-233-1/+20
* | | | | | | | | Simplify setting button form optionsCarlos Antonio da Silva2015-03-221-2/+3
* | | | | | | | | Fix arguments order on assertionCarlos Antonio da Silva2015-03-221-1/+1
* | | | | | | | | Merge pull request #19465 from radanskoric/fix-errors-deleteRafael Mendonça França2015-03-222-7/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ActiveModel::Errors#delete return value to stay backward compatibleRadan Skoric2015-03-222-7/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19455 from jonatack/patch-1Carlos Antonio da Silva2015-03-221-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Consistent spacing inside hash bracketsJon Atack2015-03-221-14/+14
* | | | | | | | | | Move #19447 changelog to the top and reword it a bit [ci skip]Carlos Antonio da Silva2015-03-221-6/+8
* | | | | | | | | | Merge pull request #19434 from kirs/deprecate-alias-method-chainRafael Mendonça França2015-03-227-108/+150
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deprecate alias_method_chain in favour of Module#prependKir Shatrov2015-03-227-108/+150
* | | | | | | | | | | Merge pull request #19461 from mechanicles/change-a-to-anRafael Mendonça França2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change 'a' to 'an' for 'HABTM' word [ci skip]Santosh Wadghule2015-03-231-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #19460 from yui-knk/feature/add_linkArthur Nogueira Neves2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Add link for "parameter_names section"yui-knk2015-03-231-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #19454 from yui-knk/fix/guide_migrationsAbdelkader Boudih2015-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |