aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Only include Rake::DSL if it's defined.Joe Van Dyk2012-04-211-1/+1
| | | | | | | | | | | | rake < 0.9 doesn't define Rake::DSL.
* | | Merge pull request #5936 from arunagw/other_readme_fixesVijay Dev2012-04-236-6/+6
|\ \ \ | | | | | | | | Updated other README to point 3-2-stable
| * | | Updated other README to point 3-2-stableArun Agrawal2012-04-236-6/+6
| | | |
* | | | Merge pull request #5935 from arunagw/readme_fixes_3-2-stableVijay Dev2012-04-231-1/+1
|\ \ \ \ | |/ / / |/| | | As ARes is removed from master then 3-2-stable URL should be in README.
| * | | ARes URL should be pointed to 3-2-stable tree not master.Arun Agrawal2012-04-231-1/+1
|/ / /
* | | Merge pull request #5896 from sferik/revert_5861Jeremy Kemper2012-04-212-4/+18
|\ \ \ | |/ / |/| | Revert #5861. Feature-detect which MultiJson API to use.
| * | Use `Object#respond_to?` to determine which MultiJson API to useErik Michaels-Ober2012-04-181-3/+17
| | |
| * | Revert "multi_json is restricted to < 1.3 "Erik Michaels-Ober2012-04-181-1/+1
| | | | | | | | | | | | This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b.
* | | Be sure to correctly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-192-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option Backports #5900 Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
* | | Merge pull request #5898 from benedikt/3-2-stableJeremy Kemper2012-04-196-8/+40
|\ \ \ | |/ / |/| | Readds the fix for #5667 and back ports the regression fix from #5718
| * | Removes unneeded caching from ActiveRecord::Base.relationBenedikt Deicke2012-04-191-4/+3
| | |
| * | Revert "Revert "Fix #5667. Preloading should ignore scoping.""Benedikt Deicke2012-04-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1166d49f62ccab789be208112163ad13183224e2. Conflicts: activerecord/test/cases/associations/eager_test.rb
| * | Adds test to check that circular preloading does not modify Model.unscoped ↵Benedikt Deicke2012-04-193-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | (as described in #5667) Conflicts: activerecord/test/cases/associations/eager_test.rb
| * | Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-192-2/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" Conflicts: activerecord/lib/active_record/core.rb
* | Revert "Fix #5667. Preloading should ignore scoping."Jeremy Kemper2012-04-183-20/+2
| | | | | | | | | | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.
* | Add hook for add_resource_routeSantiago Pastorino2012-04-184-7/+21
| |
* | Merge pull request #5894 from norman/3-2-fix-nil-loggerAaron Patterson2012-04-181-1/+1
|\ \ | | | | | | Fix nil logger on 3.2
| * | Check for nil loggerNorman Clarke2012-04-181-1/+1
|/ /
* | Merge pull request #5874 from asanghi/3-2-stableJeremy Kemper2012-04-174-5/+5
|\ \ | |/ |/| replace ruby-debug19 with debugger on Rails 3-2 stable
| * Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵Aditya Sanghi2012-04-174-5/+5
|/ | | | maintained debugger gem
* Merge pull request #5861 from arunagw/multi_json_fix_3-2-stableJeremy Kemper2012-04-161-1/+1
|\ | | | | Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
| * multi_json is restricted to < 1.3 Arun Agrawal2012-04-161-1/+1
| | | | | | | | Some API changes are there above 1.3. 3-2-stable
* | Add missing require in Active Support time zones (fixes #5854)Piotr Sarnacki2012-04-151-0/+1
|/ | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
* "rails new -h" shows message in rails directoryask2012-04-132-3/+17
|
* fix typo in readme [ci skip]Vijay Dev2012-04-121-1/+1
|
* Fix code example in generator test casePrem Sichanugrist2012-04-121-2/+2
|
* Merge pull request #5820 from arunagw/more_ruby-2-0-fixesJeremy Kemper2012-04-121-1/+9
|\ | | | | Update test for Ruby 2 compatibility
| * test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-04-121-1/+9
|/
* Merge pull request #5800 from arunagw/bigdecimal_dupJeremy Kemper2012-04-102-3/+24
|\ | | | | Backport BigDecimal#duplicable? feature check from master
| * probably should require the objects we monkey patch.Aaron Patterson2012-04-101-0/+1
| |
| * bigdecimal can be duped on Ruby 2.0Aaron Patterson2012-04-102-2/+22
| | | | | | | | | | | | Conflicts: activesupport/test/core_ext/duplicable_test.rb
| * add the class name to the assertion messageAaron Patterson2012-04-101-1/+1
|/
* Merge pull request #5799 from arunagw/readme_fixVijay Dev2012-04-101-2/+2
|\ | | | | Readme fix
| * README fix! [skip ci]Arun Agrawal2012-04-101-2/+2
| |
* | Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\ \ | | | | | | Remove unused castcode
| * | Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
| | |
* | | rewords the section about default_url_options in the Action Controller ↵Xavier Noria2012-04-091-3/+4
| |/ |/| | | | | Overview guide
* | Merge pull request #5784 from rafaelfranca/default_url-3-2Santiago Pastorino2012-04-083-4/+4
|\ \ | | | | | | [3-2-stable] Document that default_url_options must return a hash with symbolized keys
| * | Document that default_url_options must return a hash with symbolizedRafael Mendonça França2012-04-091-0/+1
| | | | | | | | | | | | keys
| * | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-083-4/+3
| | |
* | | Fix 'Everyday Git' linkAnil Wadghule2012-04-071-1/+1
| | |
* | | Merge pull request #5765 from anildigital/3-2-stableVijay Dev2012-04-061-4/+4
|\ \ \ | |/ / |/| | Update getting started guide to change Rails version to Rails 3.2
| * | Fix Rails version in getting started guide.Anil Wadghule2012-04-061-4/+4
|/ /
* | Merge pull request #5737 from rafaelfranca/3-2-stableSantiago Pastorino2012-04-041-3/+1
|\ \ | | | | | | Fix tests of benchmark with silence equals to true
| * | Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
|/ /
* | Merge pull request #5188 from jlxw/patch-1Santiago Pastorino2012-04-041-1/+1
| | | | | | | | logger.silence is deprecated
* | Merge pull request #5727 from hone/ar_database_url_loggingAaron Patterson2012-04-032-0/+66
|\ \ | |/ |/| ActiveRecord configuration logging
| * log which config format AR uses to connect withTerence Lee2012-04-032-0/+23
| |
| * test initializer logic for DATABASE_URL env varTerence Lee2012-04-031-0/+43
|/
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 04:36:30 +0000