aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3Andrew White2012-04-291-0/+1
| |
* | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-292-1/+34
| |
* | Merge pull request #6051 from rafaelfranca/fix_buildJosé Valim2012-04-292-3/+3
|\ \ | | | | | | Fix the build
| * | Remove warning of unused variableRafael Mendonça França2012-04-291-1/+1
| | |
| * | Fix the build.Rafael Mendonça França2012-04-291-2/+2
|/ / | | | | | | | | * The method for persisted records in 3-2-branch is 'PUT' * size is generated by default in inputs
* | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
| | | | | | | | | | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb
* | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-284-2/+27
| | | | | | | | closes #3341
* | Allow Thor 0.15 and 1.0, to be released shortlytomhuda2012-04-281-1/+5
|/
* Merge pull request #6038 from arunagw/warning_removed_3-2-stablePiotr Sarnacki2012-04-281-1/+0
|\ | | | | Warning removed 3 2 stable
| * Remove circular require of time/zonesOscar Del Ben2012-04-291-1/+0
|/
* Merge pull request #6022 from sikachu/3-2-stable-record_tag_backportAaron Patterson2012-04-272-2/+8
|\ | | | | Do not mutate options hash
| * Do not mutate options hashCarlos Antonio da Silva2012-04-272-2/+8
|/
* Merge pull request #4528 from j-manu/log-tailer-fixAaron Patterson2012-04-271-3/+7
| | | | Fix for log tailer when the log file doesn't exist.
* fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
|
* Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2Jeremy Kemper2012-04-241-1/+1
|\ | | | | Add extra order clause to fix failing test on Ruby 1.8.7
| * Add extra order clause to fix failing test on Ruby 1.8.7Carlos Antonio da Silva2012-04-241-1/+1
|/
* Merge pull request #5968 from sikachu/3-2-stable-backportJeremy Kemper2012-04-242-3/+9
|\ | | | | Backport workarounds for Mocha behavior changes.
| * Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-242-3/+9
|/
* Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflictSantiago Pastorino2012-04-231-9/+11
|\ | | | | Fix broken test from the earlier merge conflict
| * Fix broken test from the earlier merge conflictPrem Sichanugrist2012-04-231-9/+11
|/ | | | Seriously people, please run the test before submitting pull request.
* Merge pull request #5866 from tiegz/minor_fixes_3-2-stableAaron Patterson2012-04-232-42/+27
|\ | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-47/+23
| | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb
| * catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
| |
* | Merge pull request #5919 from joevandyk/rake-dsl-fixJeremy Kemper2012-04-231-1/+1
|\ \ | | | | | | Only include Rake::DSL if it's defined (Rake >= 0.9)
| * | 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
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:20:12 +0000