aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-293-3/+21
| | | | | | | Specify type of singular assication during serialization Conflicts: activemodel/CHANGELOG.md activemodel/test/cases/serializers/xml_serialization_test.rb
* Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fixAaron Patterson2012-11-282-9/+29
|\ | | | | Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport]
| * 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 value
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits 978ec98c8eff824a60c7e973f369cc7bed1f4d36 and 51676652a3568ad09b06385564de4fdcb13af05e changed database statements to use the schema_cache methods, added on master in c99e34e90d763c52cbe8dc3d950ed1b4db665dc4 and dc973e78560a6514ab172f0ee86dc84a9147d39a But apparently the methods weren't added to schema_cache, resulting in the failure described in #8322 for 3-2-stable. Fixes #8322. Conflicts: activerecord/lib/active_record/connection_adapters/schema_cache.rb
* | Merge pull request #8325 from steveklabnik/backport_7997Carlos Antonio da Silva2012-11-261-1/+1
|\ \ | | | | | | @steveklabnik can't spell 'distance.' [ci skip]
| * | @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.
| * | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-11-263-7/+21
|/ / | | | | | | This is a backport of rails/rails#7997.
* | 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
| | | | | | | | | | | | | | | | | | | | | | Don't call will_change! for datetime nil->"". Setting a nil datetime attribute to a blank string should not cause the attribute to be dirty. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
* | 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`
| * | backport #8291, prevent mass assignment of polymorphic type with `build`Yves Senn2012-11-223-1/+15
|/ / | | | | | | | | | | | | | | | | Closes #8265 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/association.rb
* | Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
| | | | | | | | | | | | fix guide with field_with_error proc example [ci skip]
* | Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-204-0/+35
| | | | | | | | | | | | | | Postgresql doesn't accepts limits on text columns Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
* | Be a bit less conservative with mysql in adapterCarlos Antonio da Silva2012-11-191-1/+1
| | | | | | | | This will allow the new mysql 2.9.0 to be used, fixing our test issues.
* | Merge pull request #8258 from kommen/eager_loading_with_select_test2Carlos Antonio da Silva2012-11-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Add test to ensure preloading works as expected with "group", "select" and "includes". Conflicts: activerecord/test/cases/relations_test.rb Chery-pick a739340d3c9e66814429af6f3f410c01ff86810a: Ensure ordering to make the test pass with postgresql Conflicts: activerecord/test/cases/relations_test.rb
* | 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 engines
| * | backport #8262, require bundler groups to include rake-tasks in enginesYves Senn2012-11-192-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | If you generate a full engine, this will include rake tasks from your gem under the `app` namespace. For example if you have a dependency on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec` Closes #8229 Conflicts: railties/CHANGELOG.md
* | 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
| | | | | | | | | | | | | | According to him, at one point his fork was the one that had the call stack printer, and it's in the main repo now. [ci skip]
* | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | Backport 4bc2ae0 to fix #7950 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb
| * | Test/changelog for has_many bug on unsaved recordsGeorge Brocklehurst2012-11-102-0/+13
| | | | | | | | | | | | | | | | | | | | | See issue #7950. The previous commit fixes this bug, and is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13.
| * | use bind values for join columnsAaron Patterson2012-11-106-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13. It fixes bug #7950. Conflicts: activerecord/lib/active_record/relation/calculations.rb activerecord/lib/active_record/relation/finder_methods.rb
* | | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist` Conflicts: actionpack/CHANGELOG.md actionpack/test/template/template_test.rb
* | | 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
| * | | backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-154-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md
| * | | Fixes issue #6251David Padilla2012-11-151-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* | | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-2/+2
|\ \ \ | | | | | | | | [ci skip] Correct examples for form_tag helper.
| * | | [ci skip] Correct examples for form_tag helper.DawidJanczak2012-11-141-2/+2
|/ / /
* | | fix testJon Leighton2012-11-131-3/+3
| | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/locking_test.rb
* | | 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. Conflicts: activerecord/CHANGELOG.md
| * | | backport #8176, `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-133-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
* | | | 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 result Conflicts: activerecord/CHANGELOG.md
| * | | | Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-134-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's safe to use `nil?` instead of `blank?` because it's impossible to get an array on finder with bang; `all_by` finder matches against regex without bang: `when /^find_(all_|last_)?by_([_a-zA-Z]\w*)$/`. Fixes #7238
* | | | | 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 mode...
| * | | | Fix deleting from a HABTM join table upon destroying an object of a model ↵Nick Rogers2012-11-136-1/+31
|/ / / / | | | | | | | | | | | | with optimistic locking enabled. Fixes #5332.
* | | | 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 database.yml but also DATABASE_URL.
| * | | Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only ↵kennyj2012-11-143-6/+22
|/ / / | | | | | | | | | database.yml but also DATABASE_URL.
* | | Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-132-8/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f. Reason: too many incompatibilities make a lot of Rails tests fail in 1.9. Might need more work to get this done properly in 3-2 if necessary.
* | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:30:24 +0000