aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Merge pull request #8528 from le0pard/fixed_ar_intrangeRafael Mendonça França2012-12-179-5/+170
| |\|
| | * AR supporting new intrange data type on PostgreSQL >= 9.2Alexey2012-12-169-5/+170
| * | Merge pull request #8521 from schneems/schneems/html-routesRafael Mendonça França2012-12-174-4/+80
| |\ \
| | * | HTML formatting to Rails::InfoController#routesschneems2012-12-174-4/+80
* | | | Add app/models/concerns and app/controllers/concerns to the default directory...David Heinemeier Hansson2012-12-183-0/+17
|/ / /
* | | Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
* | | Merge pull request #8539 from frodsan/fix_as_basic_objectCarlos Antonio da Silva2012-12-171-2/+1
|\ \ \
| * | | fix AS::BasicObject :nodoc: [ci skip]Francesco Rodriguez2012-12-171-2/+1
|/ / /
* | | Merge pull request #8532 from ptn/add_missing_requireXavier Noria2012-12-161-0/+3
|\ \ \
| * | | Add missing requires to core_ext/integer/timePablo Torres2012-12-161-0/+3
|/ / /
* | | Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-pathSteve Klabnik2012-12-161-1/+1
|\ \ \ | |/ / |/| |
| * | DebugExceptions `File.join` => `File.expand_path`schneems2012-12-161-1/+1
* | | Restored 'Working with Validation Errors'Steve Klabnik2012-12-161-0/+140
| |/ |/|
* | Merge pull request #8518 from rwz/inheritable-basic-objectJeremy Kemper2012-12-152-2/+19
|\ \
| * | AS::BasicObject can be inherited fromPavel Pravosud2012-12-152-2/+19
* | | Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the a...Roberto Vasquez Angel2012-12-155-0/+131
* | | Merge pull request #8519 from rubys/masterRafael Mendonça França2012-12-151-2/+2
|\ \ \
| * | | Remove blank lines from generated GemfileSam Ruby2012-12-151-2/+2
|/ / /
* | | make an editing pass through the upgrading guide [ci skip]Vijay Dev2012-12-151-30/+16
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-1515-189/+435
|\ \ \ | |/ / |/| |
| * | copy editing [ci skip]Vijay Dev2012-12-153-3/+3