aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Improve docs, changelog and release notes for Action Mailer default_options=Carlos Antonio da Silva2012-07-064-6/+14
* | | | | Merge pull request #6950 from paneq/default_from2Carlos Antonio da Silva2012-07-064-3/+21
|\ \ \ \ \
| * | | | | Introduce config.action_mailer.default_from=Robert Pankowecki2012-07-034-3/+21
* | | | | | Merge pull request #6995 from frodsan/update_test_helpCarlos Antonio da Silva2012-07-061-1/+4
|\ \ \ \ \ \
| * | | | | | update test_help to config properly turn natural language optionFrancesco Rodriguez2012-07-061-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6990 from mirceapricop/bug/mime-type-method-nameJosé Valim2012-07-064-2/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Prevent conflict between mime types and Object methodsMircea Pricop2012-07-064-2/+33
* | | | | | Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-062-1/+17
|\ \ \ \ \ \
| * | | | | | Disable query cache for lock queriesDamir Zekic2012-07-062-1/+17
* | | | | | | Update release notes with AR::Relation#inspect change [ci skip]Carlos Antonio da Silva2012-07-062-6/+9
* | | | | | | Remove mention to csv fixtures from test_helper in guides [ci skip]Carlos Antonio da Silva2012-07-061-1/+1
| |/ / / / / |/| | | | |
* | | | | | Show the records in Relation#inspectJon Leighton2012-07-063-6/+17
|/ / / / /
* | | | | Merge pull request #6927 from parndt/patch-3Carlos Antonio da Silva2012-07-052-3/+3
|\ \ \ \ \
| * | | | | Made ArgumentError messages consistent.Philip Arndt2012-07-062-3/+3
* | | | | | Revert "push parameter instantiation to one method"Aaron Patterson2012-07-051-1/+1
* | | | | | Merge branch 'master' into testcleanAaron Patterson2012-07-059-6/+81
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #6976 from vitorbal/masterCarlos Antonio da Silva2012-07-051-1/+3
| |\ \ \ \ \ \
| | * | | | | | Add documentation for inheritance_column methodVitor Balocco2012-07-051-1/+3
| |/ / / / / /
| * | | | | | Merge pull request #6957 from francois2metz/options_methodCarlos Antonio da Silva2012-07-052-2/+12
| |\ \ \ \ \ \
| | * | | | | | Add the options method to action_controller testcase.François de Metz2012-07-042-2/+12
| * | | | | | | Merge pull request #6959 from robin850/patch-1José Valim2012-07-051-0/+49
| |\ \ \ \ \ \ \
| | * | | | | | | Add few information on the field typesRobin Dupret2012-07-041-0/+49
| | |/ / / / / /
| * | | | | | | Merge pull request #6967 from frodsan/quite_as_durationRafael Mendonça França2012-07-053-1/+15
| |\ \ \ \ \ \ \
| | * | | | | | | fix quoting for ActiveSupport::Duration instancesFrancesco Rodriguez2012-07-043-1/+15
| * | | | | | | | Merge pull request #6969 from mkdynamic/patch-1Jeremy Kemper2012-07-041-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use ArgumentError vs. RuntimeError, which is more precise.Mark Dodwell2012-07-041-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #6968 from guilleiguaran/update-test-helperRafael Mendonça França2012-07-041-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | CSV fixtures aren't supported by default anymore, update generated test_helpe...Guillermo Iguaran2012-07-041-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' into testcleanAaron Patterson2012-07-045-13/+19
|\| | | | | | | |
| * | | | | | | | activesupport gem dependencies should reflect the versions we actually useAaron Patterson2012-07-043-1/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #6961 from frodsan/fix_release_noteSantiago Pastorino2012-07-041-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix link and add activeresource link in release notes page [ci skip]Francesco Rodriguez2012-07-041-2/+2
| |/ / / / / /
| * | | | | | Update 4.0 Release NotesRafael Mendonça França2012-07-041-1/+15
| * | | | | | Kill not used constant since removal of runner methodCarlos Antonio da Silva2012-07-031-9/+0
| | |/ / / / | |/| | | |
* | | | | | push parameter instantiation to one methodAaron Patterson2012-07-031-1/+1
* | | | | | add Mime.fetch so we can have default mime typesAaron Patterson2012-07-032-2/+6
* | | | | | make the default environment have actual defaultsAaron Patterson2012-07-032-3/+16
* | | | | | assing the request on the response only onceAaron Patterson2012-07-031-4/+5
* | | | | | group things that are alikeAaron Patterson2012-07-032-10/+10
* | | | | | push functional test specific methods to it's own moduleAaron Patterson2012-07-032-9/+15
* | | | | | test should be testing to_param not to_s, remove Array subclassAaron Patterson2012-07-032-7/+3
* | | | | | push the cookie writing stuff out of the controllerAaron Patterson2012-07-032-23/+8
* | | | | | extend the controller with special logic on recycleAaron Patterson2012-07-032-16/+28
* | | | | | push req / res setting to the test runnerAaron Patterson2012-07-032-5/+10
* | | | | | extract response setting to a methodAaron Patterson2012-07-031-2/+8
|/ / / / /
* | | | | remove duplicate requires of mocha.Aaron Patterson2012-07-033-4/+0
* | | | | remove the runner method copied from minitestAaron Patterson2012-07-031-20/+7
* | | | | hook mocha in through m/t before_setup, after_teardown hooksAaron Patterson2012-07-034-9/+26
* | | | | Merge pull request #6948 from frodsan/plugin_skip_ignoreRafael Mendonça França2012-07-032-1/+9
|\ \ \ \ \
| * | | | | remove test/dummy from gitignore when "plugin new -T"Francesco Rodriguez2012-07-032-1/+9