aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8321 from steveklabnik/backport_7997Rafael Mendonça França2012-11-263-7/+21
|\
| * Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-11-263-7/+21
|/
* schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-251-1/+1
* speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-251-1/+1
* Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-253-0/+21
* Merge pull request #8295 from senny/8265_backportRafael Mendonça França2012-11-223-1/+15
|\
| * backport #8291, prevent mass assignment of polymorphic type with `build`Yves Senn2012-11-223-1/+15
|/
* Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
* Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-204-0/+35
* Be a bit less conservative with mysql in adapterCarlos Antonio da Silva2012-11-191-1/+1
* Merge pull request #8258 from kommen/eager_loading_with_select_test2Carlos Antonio da Silva2012-11-191-0/+14
* Merge pull request #8271 from senny/backport_8262Rafael Mendonça França2012-11-192-1/+6
|\
| * backport #8262, require bundler groups to include rake-tasks in enginesYves Senn2012-11-192-1/+6
|/
* Upgrade mail dependency to 2.5.2Mikel Lindsaar2012-11-181-1/+1
* Upgrade mail dependency to 2.5.0Mikel Lindsaar2012-11-181-1/+1
* Remove the git option from ruby-prof gem pointing to wycats repo.Carlos Antonio da Silva2012-11-161-1/+1
* Add changelog entry for #6003 backportCarlos Antonio da Silva2012-11-161-0/+15
* Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-11-162-11/+16
* Fix bug when url_for changes controller.Nikita Beloglazov2012-11-162-2/+11
* Merge pull request #7983 from georgebrock/bug7950-squashedCarlos Antonio da Silva2012-11-168-12/+48
|\
| * Test/changelog for has_many bug on unsaved recordsGeorge Brocklehurst2012-11-102-0/+13
| * use bind values for join columnsAaron Patterson2012-11-106-12/+36
* | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
* | Merge pull request #8227 from senny/backport_8139Rafael Mendonça França2012-11-154-3/+18
|\ \
| * | backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-154-2/+17
| * | Fixes issue #6251David Padilla2012-11-151-1/+1
|/ /
* | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-2/+2
|\ \
| * | [ci skip] Correct examples for form_tag helper.DawidJanczak2012-11-141-2/+2
|/ /
* | fix testJon Leighton2012-11-131-3/+3
* | Merge pull request #8209 from senny/backport_8176Rafael Mendonça França2012-11-133-1/+18
|\ \
| * | backport #8176, `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-133-1/+18
* | | Merge pull request #8204 from nikitug/fix_dynamic_finder_result_checkRafael Mendonça França2012-11-134-2/+21
|\ \ \
| * | | Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-134-1/+17
* | | | Merge pull request #8188 from courtland/habtm-fix-stableCarlos Antonio da Silva2012-11-136-1/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Fix deleting from a HABTM join table upon destroying an object of a model wit...Nick Rogers2012-11-136-1/+31
|/ / /
* | | Merge pull request #8205 from kennyj/fix_6951-32Rafael Mendonça França2012-11-133-6/+22
|\ \ \ | |/ / |/| |
| * | Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only da...kennyj2012-11-143-6/+22
|/ /
* | Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-132-8/+1
* | Fix warning with assigned but not used variableCarlos Antonio da Silva2012-11-131-3/+3
* | Add changelog entry for #8200 [ci skip]Carlos Antonio da Silva2012-11-131-0/+7
* | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-1311-12/+12
* | Fix json encoding test with ruby 1.8.7 and random hash orderCarlos Antonio da Silva2012-11-131-1/+2
* | Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixesCarlos Antonio da Silva2012-11-133-5/+11
|\ \
| * | Avoid a Mocha deprecation warning.James Mead2012-11-131-1/+1
| * | Fix for Test::Unit Mocha compatibility.James Mead2012-11-131-3/+5
| * | Use MiniTest in Ruby 1.8 if it is available.James Mead2012-11-131-1/+3
| * | Copy Mocha bug fix.James Mead2012-11-131-0/+2
* | | Merge pull request #8199 from senny/backport_8182Carlos Antonio da Silva2012-11-133-1/+24
|\ \ \ | |/ / |/| |
| * | backport #8185, `#as_json` isolates options when encoding a hash.Yves Senn2012-11-133-1/+24
|/ /
* | Lock mocha in ~> 0.12.x until we fix the Ruby 1.8.7 issues with 0.13.0Carlos Antonio da Silva2012-11-121-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:48:03 +0000