aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add controller and action name to the instrumentation payloadDaniel Schierbeck2014-05-103-1/+31
* Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"Yves Senn2014-05-034-114/+102
* Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-arYves Senn2014-05-034-102/+114
|\
| * Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]Arun Agrawal2014-05-034-102/+114
* | Remove duplicated fixture additionCarlos Antonio da Silva2014-05-031-1/+1
* | Refactor test to not care about the specific result of valid?Carlos Antonio da Silva2014-05-031-3/+4
|/
* Merge pull request #14952 from gregmolnar/schema_loadYves Senn2014-05-031-1/+1
|\
| * make `db:structure:load` listed with `rake -T`Greg Molnar2014-05-021-1/+1
* | docs, restructure newly added part to `includes`. [ci skip]Yves Senn2014-05-031-6/+5
* | Merge pull request #14924 from eric-chahin/issue_13854Matthew Draper2014-05-035-1/+31
|\ \
| * | Fixed custom validation context bug where childEric Chahin2014-05-015-1/+31
* | | Merge pull request #14956 from akshay-vishnoi/refactorAaron Patterson2014-05-021-1/+1
|\ \ \
| * | | Use #include? instead of #any?, make it simplerAkshay Vishnoi2014-05-031-1/+1
* | | | Merge pull request #14957 from akshay-vishnoi/test-casesRafael Mendonça França2014-05-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Test typecasting on instance rather than class itselfAkshay Vishnoi2014-05-031-1/+1
|/ / /
* | | Add missing require to fix test :bomb:Carlos Antonio da Silva2014-05-021-0/+1
* | | Add branch to arel on Gemfile to allow local bundle config [ci skip]Carlos Antonio da Silva2014-05-021-1/+1
* | | Move dup destroyed test to specific file that tests dup logicCarlos Antonio da Silva2014-05-022-9/+10
* | | passing a nil in the polymorphic array is not supported. remove nils before y...Aaron Patterson2014-05-022-4/+8
| |/ |/|
* | push up bind params on "simple" subquery calculationsAaron Patterson2014-05-022-3/+11
* | passing a nil should always raise an ArgumentErrorAaron Patterson2014-05-022-1/+25
* | eliminate repetition in guide links for past releases [ci skip]Vijay Dev2014-05-021-10/+1
* | Merge pull request #14943 from arunagw/hbakhtiyor-i18n-validation-message-sin...Rafael Mendonça França2014-05-023-6/+28
|\ \
| * | Add singular and plural form for some validation messagesAbd ar-Rahman Hamidi2014-05-023-6/+28
* | | Merge pull request #14942 from JuanitoFatas/patch/cc-by-sa-4-0Rafael Mendonça França2014-05-021-1/+1
|\ \ \
| * | | [ci skip] Update guides license to CC BY-SA 4.0 International.Juanito Fatas2014-05-021-1/+1
* | | | Merge pull request #14941 from arunagw/hbakhtiyor-new-plugin-command-advanced...Rafael Mendonça França2014-05-025-3/+65
|\ \ \ \
| * | | | skip-git should not hit git commands plugin generatorsArun Agrawal2014-05-023-14/+38
| * | | | Works correctly if git not installedRoman Shmatov2014-05-022-8/+30
| * | | | Automaticly add username and email if configured in git-scm, as bundle gemAbd ar-Rahman Hamidi2014-05-023-3/+19
| | |/ / | |/| |
* / | | Tiny follow up to #14915 [ci skip]Robin Dupret2014-05-021-19/+18
|/ / /
* / / Added link for 4.1 guides on edge guide [ci skip]Arun Agrawal2014-05-021-0/+3
|/ /
* | Follow up to 38ad5438 [ci skip]Robin Dupret2014-05-021-27/+36
* | Enhance a bit a few changelog entries [ci skip]Robin Dupret2014-05-023-9/+10
* | Merge pull request #14939 from jonatack/patch-8Damien Mathieu2014-05-021-1/+1
|\ \
| * | Form_tag_helper grammar fix [skip ci]Jon Atack2014-05-021-1/+1
|/ /
* | only add the optiosn if they are not emptyAaron Patterson2014-05-011-1/+3
* | always pass options to the _url methodAaron Patterson2014-05-012-6/+14
* | never merge url options in to the first data hashAaron Patterson2014-05-011-1/+1
* | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_modeRafael Mendonça França2014-05-014-5/+30
|\ \
| * | Stringify variables names for mysql connectionsPaul Nikitochkin2014-04-304-5/+30
* | | Merge pull request #14932 from phoet/use_file_joinRafael Mendonça França2014-05-013-2/+20
|\ \ \
| * | | always use File.joinphoet2014-05-013-2/+20
* | | | Merge pull request #14931 from heironimus/security_guide_clarityJeremy Kemper2014-05-011-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Security guide clarity.Kyle Heironimus2014-05-011-2/+2
|/ / /
* | | Merge pull request #14915 from juanpastas/patch-1Rafael Mendonça França2014-05-011-20/+37
|\ \ \
| * | | [skip ci] Document: required `via` option in `match` routing method.Juan David Pastas2014-04-301-20/+37
* | | | Merge pull request #12651 from cespare/ipv6-remote-ip-fixesRafael Mendonça França2014-05-013-2/+13
|\ \ \ \
| * | | | Make remote_ip detection properly handle private IPv6 addressesCaleb Spare2013-10-263-2/+13
* | | | | Remove unused variableRafael Mendonça França2014-05-011-1/+1