Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed typos in activesupport [ci skip] | Prathamesh Sonpatki | 2013-06-09 | 1 | -3/+3 |
| | | | | | - eval'ed to eval'd in accordance with https://github.com/rails/rails/pull/10889 - tried to improve statement about compiling Procs into methods using define_method | ||||
* | Merge pull request #10889 from diatmpravin/fix-typo-in-action-view | Xavier Noria | 2013-06-08 | 1 | -1/+1 |
|\ | | | | | fixed typo in action_view template | ||||
| * | fixed typo in action_view template | diatmpravin | 2013-06-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10893 from arunagw/test_for_checkpending_middleware | Guillermo Iguaran | 2013-06-08 | 1 | -0/+8 |
|\ \ | |/ |/| | Testing CheckPending middleware | ||||
| * | Testing CheckPending middleware | Arun Agrawal | 2013-06-08 | 1 | -0/+8 |
| | | |||||
* | | Override Time.at to work with Time-like values | Andrew White | 2013-06-08 | 3 | -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 Klabnik | 2013-06-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #10872 from AJAlabs/master | Steve Klabnik | 2013-06-07 | 1 | -4/+11 |
|\ | | | | | Update Getting Started Guide - Strong Parameter [ci skip] | ||||
| * | Update Getting Started Guide - Strong Parameters | AJ Acevedo | 2013-06-07 | 1 | -4/+11 |
| | | | | | | | | modified: guides/source/getting_started.md | ||||
* | | Revert "Merge pull request #10539 from davidcelis/ar-sql-improvements" | Jon Leighton | 2013-06-07 | 1 | -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-improvements | Jon Leighton | 2013-06-07 | 1 | -5/+1 |
|\ \ | | | | | | | Improve performance of ActiveRecord::Relation#blank? | ||||
| * | | ActiveRecord::Relation#blank? should `LIMIT 1` | David Celis | 2013-06-07 | 1 | -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_log | Carlos Antonio da Silva | 2013-06-07 | 1 | -0/+4 |
|\ \ | | | | | | | Ignore activemodel/log/ folder | ||||
| * | | Stub logger for tests | Andrey Koleshko | 2013-06-06 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #10875 from vipulnsward/fix_some_typos_in_as | Carlos Antonio da Silva | 2013-06-07 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fix some typos [ci skip] | ||||
| * | | | Fix some typos | Vipul A M | 2013-06-07 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #10874 from rlivsey/patch-1 | Andrew White | 2013-06-07 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Docfix: Use public interface instead of setting instance variables | ||||
| * | | | Docfix: Use public interface instead of setting instance variables | Richard Livsey | 2013-06-07 | 1 | -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-throwresult | Jon Leighton | 2013-06-07 | 6 | -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 Woosley | 2013-05-10 | 3 | -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 Woosley | 2013-05-10 | 2 | -3/+8 |
| | | | | | | | | | | | | #calculate(:count) | ||||
| * | | No point in memoizing a simple literal string. | Ben Woosley | 2013-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Add coverage for the fact that pluck without an argument returns all the ↵ | Ben Woosley | 2013-05-10 | 1 | -0/+5 |
| | | | | | | | | | | | | table's columns. | ||||
| * | | Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when ↵ | Ben Woosley | 2013-05-10 | 2 | -0/+8 |
| | | | | | | | | | | | | failing to construct_limited_ids_condition. | ||||
* | | | Merge pull request #10871 from arunagw/lifo-to-rails | Xavier Noria | 2013-06-06 | 3 | -5/+5 |
|\ \ \ | | | | | | | | | As we have moved to rails/docrails from lifo/docrails | ||||
| * | | | As we have moved to rails/docrails from lifo/docrails | Arun Agrawal | 2013-06-06 | 3 | -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 CHANGELOG | Xavier Noria | 2013-06-06 | 1 | -0/+4 |
| | | | |||||
* | | | clearing autoloaded constants triggers routes reloading [Fixes #10685] | Xavier Noria | 2013-06-06 | 2 | -9/+61 |
| | | | | | | | | | | | | | | | Conflicts: railties/test/application/loading_test.rb | ||||
* | | | Merge pull request #10867 from iHiD/patch-1 | Xavier Noria | 2013-06-06 | 1 | -0/+2 |
|\ \ \ | |_|/ |/| | | Add info about contributing to docs to CONTRIBUTING.md | ||||
| * | | Add info about contributing to docs to CONTRIBUTING.md | Jeremy Walker | 2013-06-06 | 1 | -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_migration | Aaron Patterson | 2013-06-05 | 1 | -0/+1 |
|\ \ | | | | | | | Fixing build for not checking migration | ||||
| * | | Fixing build for not checking migration | Arun Agrawal | 2013-06-05 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #10850 from arunagw/build_fix_null_migration | Aaron Patterson | 2013-06-05 | 1 | -3/+3 |
|\ \ | | | | | | | Need to pass parameters | ||||
| * | | Fix Build. Changing constructor. | Arun Agrawal | 2013-06-05 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #10482 from scudco/10432-fix-add-column-with-array | Aaron Patterson | 2013-06-05 | 3 | -0/+34 |
|\ \ | | | | | | | Fixes #10432 add_column not creating array columns in PostgreSQL | ||||
| * | | Fixes #10432 add_column not creating array columns in PostgreSQL | Adam Anderson | 2013-06-04 | 3 | -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 files | Aaron Patterson | 2013-06-05 | 1 | -2/+25 |
| | | | |||||
* | | | Fix #10789. Now at last ::Logger doesn't support #silence method . | kennyj | 2013-06-05 | 2 | -3/+10 |
| | | | |||||
* | | | the typecast value should be passed to the serializer. fixes #10830 | Aaron Patterson | 2013-06-05 | 2 | -6/+5 |
| | | | |||||
* | | | adding a test for #10830 | Aaron Patterson | 2013-06-05 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/adapters/postgresql/bytea_test.rb | ||||
* | | | Merge pull request #10841 from latortuga/fix-underscore-dependency-tracking | David Heinemeier Hansson | 2013-06-04 | 2 | -14/+42 |
|\ \ \ | | | | | | | | | Fix mismatching variable names when using an underscore | ||||
| * | | | Fix mismatching variable names when using an underscore | Drew Ulmer | 2013-06-04 | 2 | -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_paths | Rafael Mendonça França | 2013-06-04 | 1 | -11/+7 |
|\ \ \ \ | | | | | | | | | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_params | ||||
| * | | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_params | Genadi Samokovarov | 2013-06-04 | 1 | -11/+7 |
| | | | | | |||||
* | | | | | Merge pull request #10838 from gsamokovarov/routing-autoload_under | Rafael Mendonça França | 2013-06-04 | 1 | -5/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | DRY-up ActionDispatch::Routing autoloads | ||||
| * | | | | Dry-up ActionDispatch::Routing autoloads | Genadi Samokovarov | 2013-06-04 | 1 | -5/+7 |
| |/ / / | |||||
* | | | | Merge pull request #10832 from wangjohn/removing_use_of_application_constant | José Valim | 2013-06-03 | 8 | -50/+50 |
|\ \ \ \ | |_|/ / |/| | | | Removing use of subclassed application constant and replacing with Rails.application | ||||
| * | | | Removing use of subclassed application constant and instead using the | wangjohn | 2013-06-03 | 8 | -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_transformation | Rafael Mendonça França | 2013-06-03 | 3 | -6/+25 |
|\ \ \ | | | | | | | | | Prevent side effects in `Hash#with_indifferent_access`. | ||||
| * | | | Prevent side effects in `Hash#with_indifferent_access`. | Yves Senn | 2013-05-29 | 3 | -6/+25 |
| | | | |