aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix doc pointing to non existent logger class [ci skip]Carlos Antonio da Silva2012-12-211-1/+1
* Fix indentation issuing warningCarlos Antonio da Silva2012-12-201-1/+1
* Merge pull request #8560 from u16suzu/masterRafael Mendonça França2012-12-201-2/+2
|\
| * Fix: documentation for String#humanizeYuichiro Suzuki2012-12-201-2/+2
* | Merge pull request #8567 from frodsan/update_coding_conventions_journeyRafael Mendonça França2012-12-2017-438/+440
|\ \
| * | update AD::Journey to follow Rails coding conventionsFrancesco Rodriguez2012-12-2017-438/+440
* | | Fix CHANGELOG entry about scope changeGuillermo Iguaran2012-12-201-1/+1
|/ /
* | Fix Action Mailer changelog indenation to match other changelogsCarlos Antonio da Silva2012-12-194-27/+29
* | Improve AMo changelog example to not rely on AR [ci skip]Carlos Antonio da Silva2012-12-191-4/+8
* | Merge pull request #8565 from frodsan/wed_code_journeyCarlos Antonio da Silva2012-12-1920-85/+77
|\ \
| * | :nodoc: Journey because is not part of the public API [ci skip]Francesco Rodriguez2012-12-1920-78/+75
| * | remove code for Ruby 1.8.x supportFrancesco Rodriguez2012-12-191-7/+2
|/ /
* | Remove the actual extension file as well [ci skip]Andrew White2012-12-191-11/+0
* | Remove obsolete Hash extension needed for Ruby 1.8.x supportAndrew White2012-12-191-1/+0
* | Integrate Journey into Action DispatchAndrew White2012-12-1946-6/+3970
* | Merge pull request #8559 from mshytikov/runner_method_is_slow_with_thread_safeJosé Valim2012-12-191-1/+10
|\ \
| * | attempt to fix slow runner name methodMax Shytikov2012-12-191-1/+10
* | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2012-12-191-5/+5
|/ /
* | Revert "Add test to deprecation of Path#children"Carlos Antonio da Silva2012-12-191-6/+0
* | Merge pull request #8522 from senny/3489_index_names_on_copyCarlos Antonio da Silva2012-12-193-2/+16
|\ \
| * | Keep index names when using with sqlite3Yves Senn2012-12-193-2/+16
* | | Merge pull request #8554 from yahonda/binary_count_oracleCarlos Antonio da Silva2012-12-191-2/+1
|\ \ \
| * | | Address test_binary_data_is_not_logged with Oracle databaseYasuo Honda2012-12-191-2/+1
| |/ /
* | | Merge pull request #8523 from reednj77/remove-mail-to-encodingDavid Heinemeier Hansson2012-12-183-110/+17
|\ \ \
| * | | Remove obfuscation support from mail_to helperNick Reed2012-12-183-110/+17
|/ / /
* | | Merge pull request #8552 from frodsan/concerned_testsCarlos Antonio da Silva2012-12-182-2/+5
|\ \ \ | |/ / |/| |
| * | update concerned testsFrancesco Rodriguez2012-12-181-0/+2
| * | fix railties CHANGELOG [ci skip]Francesco Rodriguez2012-12-181-2/+3
|/ /
* | Fix argument name in fixtures methodCarlos Antonio da Silva2012-12-181-1/+1
* | Revert "use File.basename to get the filename minus .yml"Aaron Patterson2012-12-181-4/+3
* | Revert "Merge pull request #7587 from elia/fix-too-eager-loading"Rafael Mendonça França2012-12-183-17/+6
* | Merge pull request #8548 from garysweaver/postgresql_fallback_to_disable_user...Rafael Mendonça França2012-12-182-4/+17
|\ \
| * | #5523 Add ability for postgresql adapter to disable user triggers in disable_...Gary S. Weaver2012-12-182-4/+17
|/ /
* | Fix changelogDavid Heinemeier Hansson2012-12-181-3/+1
* | MergeDavid Heinemeier Hansson2012-12-1822-49/+374
|\ \
| * \ Merge branch 'uniqueness-validation-postgresql-arrays'Carlos Antonio da Silva2012-12-183-35/+58
| |\ \
| | * | Extract some methodsCarlos Antonio da Silva2012-12-181-16/+22
| | * | Change relation in placeCarlos Antonio da Silva2012-12-181-1/+1
| | * | Simplify value logic by always typecastingCarlos Antonio da Silva2012-12-181-11/+5
| | * | Avoid unnecessary hashes with error optionsCarlos Antonio da Silva2012-12-181-1/+4
| | * | Remove prepend_and_append requirement from ASCarlos Antonio da Silva2012-12-181-3/+1
| | * | Refactor uniqueness validator logic a bitCarlos Antonio da Silva2012-12-181-10/+5
| | * | Added support for validates_uniqueness_of in PostgreSQL array columns. Fixes:...Pedro Padron2012-12-183-4/+31
| |/ /
| * | Minor js review [ci skip]Carlos Antonio da Silva2012-12-181-7/+7
| * | Merge pull request #8389 from nashby/issue-8388Steve Klabnik2012-12-183-3/+33
| |\ \
| | * | handle protocol option in stylesheet_link_tag and javascript_include_tagVasiliy Ermolovich2012-12-183-3/+33
| |/ /
| * | Merge pull request #8543 from schneems/schneems/html-route-errorRafael Mendonça França2012-12-176-76/+81
| |\ \
| | * | Format routes as html on debug pageschneems2012-12-176-76/+81
| |/ /
| * | Merge pull request #8542 from le0pard/fixed_ar_intrangeRafael Mendonça França2012-12-172-5/+29
| |\ \
| | * | AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix...Alexey2012-12-172-5/+29