aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless elseArun Agrawal2013-05-101-3/+0
|
* Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-083-6/+11
| | | | | | | | | | | | | | | This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb Reason: This caused a regression since it changed the behavior in a stable release. Fixes #9777
* Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-083-23/+23
| | | | | | | | | | | | This reverts commit 815a9431ab61376a7e8e1bdff21f87bc557992f8. Conflicts: activesupport/test/json/encoding_test.rb Reason: This was causing a regression where the resulting string is always returning UTF-8. Also it changes the behavior of this method on a stable release. Fixes #9498.
* Merge pull request #10496 from arunagw/build-fix-scaffold-generatorCarlos Antonio da Silva2013-05-071-1/+1
|\ | | | | Build fix for scaffold generator
| * Build fix for scaffold generator Arun Agrawal2013-05-071-1/+1
|/ | | 3-2 behaves different when scaffolding.
* Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-1/+28
| | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/belongs_to.rb
* Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
| | | | | | use canonical #controller_path logic in controller test cases Conflicts: actionpack/lib/action_controller/test_case.rb
* Merge pull request #10406 from greenriver/distance_of_time_rationalRafael Mendonça França2013-05-062-1/+6
|\ | | | | Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn)
| * Merging in fix from #8222Ben Tucker2013-05-062-1/+6
| |
* | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
| | | | | | | | Fix tests related to scaffolding generator with --assets=false switch
* | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-043-1/+20
|/ | | | | | | | | | Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
* adding test for the symbol refsAaron Patterson2013-04-261-0/+7
|
* just clear the caches on clear! rather than replacing. fixes #10251Aaron Patterson2013-04-171-8/+4
|
* adding a test for root path in the appAaron Patterson2013-04-171-0/+24
|
* Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygemsCarlos Antonio da Silva2013-04-171-1/+1
|\ | | | | Using secure source https://rubygems.org when generating new plugin with Rails 3.2
| * Use secure source in generated Gemfile for creating new plugin. Closes #10245Prathamesh Sonpatki2013-04-171-1/+1
| |
* | Fix "Scaling Rails Screencasts" link in caching guideCarlos Antonio da Silva2013-04-161-1/+1
|/ | | | Closes #10241 [ci skip]
* Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2Carlos Antonio da Silva2013-04-131-17/+41
|\ | | | | 3-2-stable documentation: the possibility to use a hash of hashes for nested attributes
| * Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
|/ | | | | | Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes). Align indentation in comments.
* Merge pull request #10172 from senny/10098_backportRafael Mendonça França2013-04-114-1/+13
|\ | | | | Backport: Correctly parse bigint defaults in PostgreSQL
| * Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-114-1/+13
|/ | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb
* Merge branch '3-2-later' into 3-2-stableAaron Patterson2013-04-091-0/+10
|\ | | | | | | | | * 3-2-later: adding test for CVE
| * adding test for CVEAaron Patterson2013-02-091-0/+10
| |
* | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
| |
* | Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fieldsRafael Mendonça França2013-04-053-8/+24
|\ \ | | | | | | Fix explicit names on multiple file fields
| * | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
|/ / | | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830
* | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | Use 1.8 hash style in test viewsCarlos Antonio da Silva2013-04-032-2/+2
| | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-034-2/+22
|\ \ | | | | | | Fixes Issue #7490: Chained scopes will preload properly
| * | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-034-2/+22
| | |
* | | Common behavior with adding formats to lookup_context for TemplateRenderer ↵Dmitry Vorotilin2013-04-0212-4/+33
| | | | | | | | | | | | and PartialRenderer
* | | Fix formatting and minor review in AP changelogCarlos Antonio da Silva2013-03-301-9/+8
| | | | | | | | | | | | Sentences starting with # are considered headings.
* | | Add attr_accessible to the Getting Started Guide.Steve Klabnik2013-03-291-0/+2
| | | | | | | | | | | | | | | This was brought up in #9995, but is only present in 3-2-stable, since mass assignment is removed from Rails 4.
* | | Removing explain support warning from the RailtieRafael Mendonça França2013-03-282-7/+7
| | | | | | | | | | | | | | | | | | | | | This is causing a regression since the Active Record Railtie is trying to connect to the development database in the application boot. See https://github.com/rails/rails/pull/6197#issuecomment-15199273
* | | Merge pull request #9943 from fredwu/test_fix_for_74e59eaCarlos Antonio da Silva2013-03-261-1/+1
|\ \ \ | | | | | | | | Fixed test failures on 1.8.7 caused by 74e59ea
| * | | Fixed test failures on 1.8.7 caused by 74e59eaFred Wu2013-03-271-1/+1
|/ / /
* | | Merge pull request #9576 from ↵Rafael Mendonça França2013-03-263-1/+18
|\ \ \ | | | | | | | | | | | | | | | | fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable [Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.
| * | | Added changelog for 55e2954Fred Wu2013-03-271-0/+5
| | | |
| * | | Don't reset inheritance_column when setting explicitly.Fred Wu2013-03-272-1/+13
|/ / / | | | | | | This is backported from master (cdfcbc4).
* | | Merge pull request #9899 from macksmind/backport_5808Jeremy Kemper2013-03-243-6/+60
|\ \ \ | | | | | | | | Backport #5808
| * | | Backport #5808Mack Earnhardt2013-03-243-6/+60
|/ / / | | | | | | | | | | | | | | | df36c5f - Fix assert_template assertion with :layout option 4bd05a7 - Fix assert_template :layout => nil assertion 0d19a08 - Improve assert_template layout checking
* | | Merge pull request #9873 from senny/use_old_hash_syntaxJon Leighton2013-03-221-1/+1
|\ \ \ | | | | | | | | use ruby 1.8 Hash syntax [ci skip]
| * | | use ruby 1.8 Hash syntax [ci skip]Yves Senn2013-03-221-1/+1
|/ / /
* | | Merge pull request #9870 from senny/9806_eager_loading_regressionJon Leighton2013-03-222-2/+8
|\ \ \ | | | | | | | | do not reset associations when preloading twice.
| * | | do not reset associations when preloading twice.Yves Senn2013-03-222-2/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | Closes #9806. As the `through_options` always contained `{:order=>nil}` the second time, the preloader ran, the association was always reset. This patch only adds the `:order` to the `through_options` if it is set.
* | | Fix test to Ruby 1.8Rafael Mendonça França2013-03-211-1/+1
| | | | | | | | | | | | Pathname doesn't respond to to_path
* | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-03-211-1/+5
| | |
* | | Merge branch '3-2-stable' into fredwu-slow_view_loading_fixAaron Patterson2013-03-206-2/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable: Merge pull request #9802 from newsline/fix-broken-action-missing Remove bad changelog entry from AR [ci skip] Wrong exception is occured when raising no translatable exception Don't crash exception translation w/ nil result attribute. Conflicts: actionpack/CHANGELOG.md
| * | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-203-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md Conflicts: actionpack/test/controller/base_test.rb Fixes #9799
| * | | Remove bad changelog entry from AR [ci skip]Carlos Antonio da Silva2013-03-201-3/+0
| | | | | | | | | | | | | | | | Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:24:45 +0000