aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make output of distance_of_time_in_words consistentAndrew White2012-12-042-4/+21
* Merge pull request #8413 from senny/8403_backportRafael Mendonça França2012-12-044-2/+26
|\
| * backport #8403, no intermediate AR objects when eager loading.Yves Senn2012-12-044-2/+26
|/
* Bump mailer to quiet the stdout log messagesJeremy Kemper2012-12-041-1/+1
* Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-12-033-1/+20
* Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-2/+2
* Skip ruby-prof in Gemfile for Ruby 2.0Carlos Antonio da Silva2012-12-031-1/+1
* Use 1.8 hash styleCarlos Antonio da Silva2012-12-031-1/+1
* Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-033-4/+21
* Merge pull request #8405 from hsbt/fix-respond-initialize-dupCarlos Antonio da Silva2012-12-033-3/+3
|\
| * handled respond_to? with private methodsSHIBATA Hiroshi2012-12-033-3/+3
|/
* Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...Rafael Mendonça França2012-12-023-2/+17
* Use 1.8 hash style in xml serialization testCarlos Antonio da Silva2012-11-301-1/+1
* Make the CHANGELOG consistent [ci skip]Rafael Mendonça França2012-11-301-11/+20
* Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-11-302-3/+12
* Merge pull request #8380 from route/fix-concern-descriptionXavier Noria2012-11-301-1/+3
|\
| * Fixed description for ActiveSupport::Concern typical caseDmitry Vorotilin2012-11-301-1/+3
|/
* Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases ...Jeremy Kemper2012-11-291-5/+19
* Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-293-3/+21
* Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fixAaron Patterson2012-11-282-9/+29
|\
| * Making test accurately reflect what is going on in the schema migrations testChris Barton2012-09-182-9/+29
* | Merge pull request #8327 from elia/fix-send-data-disposition-with-symbolsCarlos Antonio da Silva2012-11-283-2/+16
|\ \
| * | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-2/+16
* | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-11-281-0/+1
* | | Use 1.8 hash style in pg specific schemaCarlos Antonio da Silva2012-11-281-3/+3
|/ /
* | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-261-1/+20
* | Merge pull request #8325 from steveklabnik/backport_7997Carlos Antonio da Silva2012-11-261-1/+1
|\ \
| * | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
* | | 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