aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Getting rid of the +automatic_inverse_of: false+ option in associations in favorwangjohn2013-06-0811-19/+45
| | | | | of using +inverse_of: false+ option. Changing the documentation and adding a CHANGELOG entry for the automatic inverse detection feature.
* Override Time.at to work with Time-like valuesAndrew White2013-06-083-0/+38
| | | | | | | Time.at allows passing a single Time argument which is then converted to an integer. The conversion code since 1.9.3r429 explicitly checks for an instance of Time so we need to override it to allow DateTime and ActiveSupport::TimeWithZone values.
* ’ -> ' [ci skip]Steve Klabnik2013-06-081-1/+1
|
* Merge pull request #10872 from AJAlabs/masterSteve Klabnik2013-06-071-4/+11
|\ | | | | Update Getting Started Guide - Strong Parameter [ci skip]
| * Update Getting Started Guide - Strong ParametersAJ Acevedo2013-06-071-4/+11
| | | | | | | | modified: guides/source/getting_started.md
* | Revert "Merge pull request #10539 from davidcelis/ar-sql-improvements"Jon Leighton2013-06-071-1/+5
| | | | | | | | | | | | | | | | | | This reverts commit 257fa6897d9c85da16b7c9fcb4ae3008198d320e, reversing changes made to 94725b81f5588e4b0f43222c4f142c3135941b4b. The build failed https://travis-ci.org/rails/rails/builds/7883546
* | Merge pull request #10539 from davidcelis/ar-sql-improvementsJon Leighton2013-06-071-5/+1
|\ \ | | | | | | Improve performance of ActiveRecord::Relation#blank?
| * | ActiveRecord::Relation#blank? should `LIMIT 1`David Celis2013-06-071-5/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an SQL improvement to ActiveRecord::Relation#blank?. Currently, it calls `to_a` on the Relation, which loads all records in the association, and calls `blank?` on the loaded Array. There are other ways, however, to check the emptiness of an association that are far more performant. `#empty?`, `#exists?` and `#any?` all attach a `LIMIT 1` to the SQL query before firing it off, which is a nice query improvement. `#blank?` should do the same! Bonus performance improvements will also happen for `#present?`, which merely calls the negation of `#blank?` Signed-off-by: David Celis <me@davidcel.is>
* | Merge pull request #10860 from ka8725/activemodel_logCarlos Antonio da Silva2013-06-071-0/+4
|\ \ | | | | | | Ignore activemodel/log/ folder
| * | Stub logger for testsAndrey Koleshko2013-06-061-0/+4
| | |
* | | Merge pull request #10875 from vipulnsward/fix_some_typos_in_asCarlos Antonio da Silva2013-06-072-2/+2
|\ \ \ | | | | | | | | Fix some typos [ci skip]
| * | | Fix some typosVipul A M2013-06-072-2/+2
| |/ /
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 02:18:09 +0000