aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10874 from rlivsey/patch-1Andrew White2013-06-071-1/+1
|\ | | | | Docfix: Use public interface instead of setting instance variables
| * Docfix: Use public interface instead of setting instance variablesRichard Livsey2013-06-071-1/+1
|/ | | Dynamically setting instance variables based on user input probably isn't a great idea. Better to go through the setter methods provided by attr_accessor.
* Merge pull request #10561 from Empact/nix-throwresultJon Leighton2013-06-076-23/+35
|\ | | | | Rather than raising ThrowResult when construct_limited_ids_conditions comes up empty, set the relation to NullRelation and rely on its results.
| * Rather than raising ThrowResult when construct_limited_ids_conditions comes ↵Ben Woosley2013-05-103-21/+15
| | | | | | | | | | | | up empty, set the relation to NullRelation and rely on its results. This will help avoid errors like 2fcafee250ee2, because in most cases NullRelation will do the right thing. Minor bonus is avoiding the use of exceptions for flow control.
| * Make NullRelation a bit more like a real relation by returning 0 for ↵Ben Woosley2013-05-102-3/+8
| | | | | | | | #calculate(:count)
| * No point in memoizing a simple literal string.Ben Woosley2013-05-101-1/+1
| |
| * Add coverage for the fact that pluck without an argument returns all the ↵Ben Woosley2013-05-101-0/+5
| | | | | | | | table's columns.
| * Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when ↵Ben Woosley2013-05-102-0/+8
| | | | | | | | failing to construct_limited_ids_condition.
* | Merge pull request #10871 from arunagw/lifo-to-railsXavier Noria2013-06-063-5/+5
|\ \ | | | | | | As we have moved to rails/docrails from lifo/docrails
| * | As we have moved to rails/docrails from lifo/docrailsArun Agrawal2013-06-063-5/+5
|/ / | | | | | | | | | | Changing links to guides. We are not worried for old versions as GitHub is handling the redirects.
* | registers recent patch in the railties CHANGELOGXavier Noria2013-06-061-0/+4
| |
* | clearing autoloaded constants triggers routes reloading [Fixes #10685]Xavier Noria2013-06-062-9/+61
| | | | | | | | | | Conflicts: railties/test/application/loading_test.rb
* | Merge pull request #10867 from iHiD/patch-1Xavier Noria2013-06-061-0/+2
|\ \ | | | | | | Add info about contributing to docs to CONTRIBUTING.md
| * | Add info about contributing to docs to CONTRIBUTING.mdJeremy Walker2013-06-061-0/+2
|/ / | | | | | | Encourage more people to contribute to Rails docs by mentioning it in the contribution guide.
* | Merge pull request #10851 from arunagw/fixing_build_pending_migrationAaron Patterson2013-06-051-0/+1
|\ \ | | | | | | Fixing build for not checking migration
| * | Fixing build for not checking migrationArun Agrawal2013-06-051-0/+1
|/ /
* | Merge pull request #10850 from arunagw/build_fix_null_migrationAaron Patterson2013-06-051-3/+3
|\ \ | | | | | | Need to pass parameters
| * | Fix Build. Changing constructor.Arun Agrawal2013-06-051-3/+3
|/ /
* | Merge pull request #10482 from scudco/10432-fix-add-column-with-arrayAaron Patterson2013-06-053-0/+34
|\ \ | | | | | | Fixes #10432 add_column not creating array columns in PostgreSQL
| * | Fixes #10432 add_column not creating array columns in PostgreSQLAdam Anderson2013-06-043-0/+34
| | | | | | | | | | | | | | | | | | When then PostgreSQL visitor was [added](https://github.com/rails/rails/commit/6b7fdf3bf3675a14eae74acc5241089308153a34) `add_column` was no longer receiving the column options directly. This caused the options to be lost along the way.
* | | only check pending migrations if there are new filesAaron Patterson2013-06-051-2/+25
| | |
* | | Fix #10789. Now at last ::Logger doesn't support #silence method .kennyj2013-06-052-3/+10
| | |
* | | the typecast value should be passed to the serializer. fixes #10830Aaron Patterson2013-06-052-6/+5
| | |
* | | adding a test for #10830Aaron Patterson2013-06-051-0/+18
| | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/postgresql/bytea_test.rb
* | | Merge pull request #10841 from latortuga/fix-underscore-dependency-trackingDavid Heinemeier Hansson2013-06-042-14/+42
|\ \ \ | | | | | | | | Fix mismatching variable names when using an underscore
| * | | Fix mismatching variable names when using an underscoreDrew Ulmer2013-06-042-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ERBTracker template digest helper class was using a regex to match render calls and it was incorrectly not matching against variables with underscores in the name. This caused it to use the wrong regex match data to populate the template dependency. Because underscore is a valid character for a variable, this fixes the ERBTracker to match it properly.
* | | | Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_pathsRafael Mendonça França2013-06-041-11/+7
|\ \ \ \ | | | | | | | | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_params
| * | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_paramsGenadi Samokovarov2013-06-041-11/+7
| | | | |
* | | | | Merge pull request #10838 from gsamokovarov/routing-autoload_underRafael Mendonça França2013-06-041-5/+7
|\ \ \ \ \ | |_|/ / / |/| | | | DRY-up ActionDispatch::Routing autoloads
| * | | | Dry-up ActionDispatch::Routing autoloadsGenadi Samokovarov2013-06-041-5/+7
| |/ / /
* | | | Merge pull request #10832 from wangjohn/removing_use_of_application_constantJosé Valim2013-06-038-50/+50
|\ \ \ \ | |_|/ / |/| | | Removing use of subclassed application constant and replacing with Rails.application
| * | | Removing use of subclassed application constant and instead using thewangjohn2013-06-038-50/+50
|/ / / | | | | | | | | | | | | more agnostic Rails.application syntax. This means tests will be more portable, and won't rely on the existence of a particular subclass.
* | | Merge pull request #10784 from senny/10526_prevent_key_transformationRafael Mendonça França2013-06-033-6/+25
|\ \ \ | | | | | | | | Prevent side effects in `Hash#with_indifferent_access`.
| * | | Prevent side effects in `Hash#with_indifferent_access`.Yves Senn2013-05-293-6/+25
| | | |
* | | | Replace comment about Sprockets stub directive with a link to README about ↵Guillermo Iguaran2013-06-032-2/+4
| | | | | | | | | | | | | | | | all directives
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-06-034-20/+4
|\ \ \ \
| * | | | Revert "Merge pull request #4490 from EmmanuelOga/master"José Valim2013-06-043-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaviour doesn't actually make sense, the context of the child should not be affected by the parent. See #10492. This reverts commit 5f8274efe128ffeec8fa3179460f5167a078f007, reversing changes made to 81e837e810460d066a2e5fc5a795366ec8ab2313.
| * | | | Merge pull request #10809 from wangjohn/fix_failing_railtie_testGuillermo Iguaran2013-06-031-1/+2
| |\ \ \ \ | | | | | | | | | | | | Fixing a failing railtie test by wrapping the command inside of sh -c
| | * | | | Fixing a failing railtie test by using the ENV variable to specify awangjohn2013-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | particular controller to search for in rake routes.
* | | | | | The behavior we had in place in rc1 was actually to convert to DateTime and ↵David Heinemeier Hansson2013-06-031-2/+2
|/ / / / / | | | | | | | | | | | | | | | use <=> from there. Restore that.
* | | | | Allow Date to be compared with Time (like it was possible to compare Time ↵David Heinemeier Hansson2013-06-032-0/+15
| | | | | | | | | | | | | | | | | | | | with Date)
* | | | | Merge pull request #10827 from trevorturk/patch-upgrade-guideDavid Heinemeier Hansson2013-06-031-16/+39
|\ \ \ \ \ | | | | | | | | | | | | Improve upgrade guide documentation about the PUT->PATCH change
| * | | | | Improve upgrade guide documentation about the PUT->PATCH changeTrevor Turk2013-06-031-16/+39
|/ / / / /
* | | | | Merge pull request #10747 from javan/patch-1David Heinemeier Hansson2013-06-031-0/+18
|\ \ \ \ \ | | | | | | | | | | | | Add note about upgrading custom routes from `put` to `patch`.
| * | | | | Add note about upgrading custom routes from `put` to `patch`.Javan Makhmali2013-05-241-0/+18
| | | | | |
* | | | | | Merge pull request #10825 from arunagw/remove-rake-packagetask-loadGuillermo Iguaran2013-06-024-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | No need to load 'rake/packagetask' as it's already in 'rubygems/package_task'
| * | | | | | No need to load 'rake/packagetask' as it's alreadyArun Agrawal2013-06-024-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in 'rubygems/package_task'
* | | | | | | Merge pull request #10824 from vipulnsward/wonderfulGuillermo Iguaran2013-06-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | wonderfull => wonderful
| * | | | | | wonderfull => wonderfulVipul A M2013-06-021-1/+1
| | | | | | |
* | | | | | | Merge pull request #10821 from kennyj/deprecations_4_1-2Rafael Mendonça França2013-06-0112-115/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove some deprecated methods in Rails 4.1 again.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:46:50 +0000