| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting" | Yves Senn | 2013-07-17 | 4 | -53/+6 | |
| | |_|/ |/| | | | | | | | | | | | This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing changes made to 754a373e301d2df0b12a11083405252722bc8366. | |||||
| * | | | parent_table is only used internally | Aaron Patterson | 2013-07-16 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | decouple the manager class from building join constraints | Aaron Patterson | 2013-07-16 | 2 | -10/+11 | |
| | | | | ||||||
| * | | | cache the klass member of the reflection | Aaron Patterson | 2013-07-16 | 1 | -8/+10 | |
| | | | | ||||||
| * | | | cache the scope chain on the stack and eliminate `i` | Aaron Patterson | 2013-07-16 | 1 | -7/+4 | |
| | | | | ||||||
| * | | | just push on to the scope chain items. Oops! (thanks @carlosantoniodasilva) | Aaron Patterson | 2013-07-16 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | use Relation#merge to combine scope chain items | Aaron Patterson | 2013-07-16 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | make sure scope_chain_items has consistent types | Aaron Patterson | 2013-07-16 | 1 | -7/+9 | |
| | | | | ||||||
| * | | | removes the obsolete private method column_methods_hash [Closes #11406] | Xavier Noria | 2013-07-16 | 4 | -43/+28 | |
| | | | | ||||||
| * | | | Skip Rack applications and redirects when generating urls | Andrew White | 2013-07-16 | 6 | -13/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating an unnamed url (i.e. using `url_for` with an options hash) we should skip anything other than standard Rails routes otherwise it will match the first mounted application or redirect and generate a url with query parameters rather than raising an error if the options hash doesn't match any defined routes. Fixes #8018 | |||||
| * | | | Merge pull request #11458 from arunagw/fix_usage_file | Carlos Antonio da Silva | 2013-07-16 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Fixed USAGE file for generator [ci skip] | |||||
| | * | | | Fixed USAGE file for generator [ci skip] | Arun Agrawal | 2013-07-16 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #11435 from kennyj/move_to_query_cache | Yves Senn | 2013-07-16 | 2 | -2/+6 | |
| |\ \ \ | | | | | | | | | Move initializing process for @query_cache to QueryCache module. | |||||
| | * | | | Move initializing process for query cache to ↵ | kennyj | 2013-07-16 | 2 | -2/+6 | |
| | | | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::QueryCache module. | |||||
| * | | | | Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting | Yves Senn | 2013-07-16 | 4 | -6/+53 | |
| |\| | | | | | | | | | | | Fixes AR mysql2 adapter incorrectly casting boolean values | |||||
| | * | | | Unifies mysql and mysql2 casting of booleans | awilliams | 2013-07-16 | 4 | -6/+53 | |
| |/ / / | | | | | | | | | | | | | Using the mysql2 adapter, boolean values were sometimes being incorrectly cast to 't' or 'f'. This changes the cast to match the mysql adapter behavior, ie 1 and 0. | |||||
| * | | | `change_column` for PG adapter respects `:array` option. | Yves Senn | 2013-07-16 | 3 | -2/+19 | |
| | | | | ||||||
| * | | | Merge pull request #11419 from simi/generator_generator_test | Guillermo Iguaran | 2013-07-16 | 8 | -1/+72 | |
| |\ \ \ | | | | | | | | | Added generated unit test for generator generator. | |||||
| | * | | | Added generated unit test for generator generator and new test:generators ↵ | Josef Šimánek | 2013-07-16 | 8 | -1/+72 | |
| |/ / / | | | | | | | | | | rake task included in test:all rake task. | |||||
| * | | | Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check ↵ | Guillermo Iguaran | 2013-07-16 | 1 | -1/+3 | |
| | | | | | | | | | | | | | #11457 for details | |||||
| * | | | save another array allocation | Aaron Patterson | 2013-07-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | removing useless assingment | Aaron Patterson | 2013-07-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | reorder bind parameters when merging relations | Aaron Patterson | 2013-07-15 | 3 | -3/+43 | |
| | | | | ||||||
| * | | | use arel rather than slapping together SQL strings | Aaron Patterson | 2013-07-15 | 2 | -5/+10 | |
| | | | | ||||||
| * | | | Merge pull request #11451 from ↵ | Yves Senn | 2013-07-15 | 2 | -0/+8 | |
| |\ \ \ | | | | | | | | | | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object | |||||
| | * | | | Do not re-save destroyed association on saving parent object | Paul Nikitochkin | 2013-07-15 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | | Closes #11450 | |||||
| * | | | | Merge pull request #11282 from ↵ | Yves Senn | 2013-07-15 | 3 | -29/+4 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | arunagw/deprecation-removed-attribute-missing-activerecord Remove deprecated `attribute_missing`. | |||||
| | * | | | | Remove deprecation warning from attribute_missing | Arun Agrawal | 2013-07-15 | 3 | -29/+4 | |
| | |/ / / | | | | | | | | | for attributes that are columns. | |||||
| * | | | | Merge pull request #11448 from arunagw/updated_middleware_test | Yves Senn | 2013-07-15 | 1 | -1/+3 | |
| |\ \ \ \ | |/ / / |/| | | | No need to add config for x_sendfile_header | |||||
| | * | | | Added CheckPending middleware in default | Arun Agrawal | 2013-07-15 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this middleware comes by default in a new rails app Added test to check omit for CheckPending when Active Record is not included. | |||||
| | * | | | No need to add config for x_sendfile_header | Arun Agrawal | 2013-07-15 | 1 | -2/+0 | |
| |/ / / | | | | | | | | | | Rack::Sendfile is loaded by default now | |||||
| * | | | Rack::Sendfile is now included in middleware by default, change tests to ↵ | Guillermo Iguaran | 2013-07-15 | 1 | -10/+4 | |
| | | | | | | | | | | | | | reflect that | |||||
| * | | | Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present" | Santiago Pastorino | 2013-07-15 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681. And allows webservers to configure X-Sendfile-Type. Closes #11440 thanks to [@MSch] Conflicts: railties/lib/rails/application.rb | |||||
| * | | | Merge pull request #11434 from jetthoughts/new_save_transaction_bugfix | Santiago Pastorino | 2013-07-14 | 3 | -3/+23 | |
| |\ \ \ | | | | | | | | | Remove extra decrement of transaction level | |||||
| | * | | | #4566: Remove extra decrement of transaction level | Paul Nikitochkin | 2013-07-14 | 3 | -3/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level. | |||||
| * | | | | Merge pull request #11439 from ernie/only-scan-strings-for-nodes | Yves Senn | 2013-07-14 | 2 | -1/+8 | |
| |\ \ \ \ | | | | | | | | | | | Blacklist->whitelist for reference scans in order! | |||||
| | * | | | | Blacklist->whitelist for reference scans in order! | Ernie Miller | 2013-07-14 | 2 | -1/+8 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | Stop special-casing Arel::Nodes as exempt from reference scanning in order. Instead, only scan order values that are strings for a table reference. | |||||
| * | | | | re-introduce `select_for_count` private method. | Yves Senn | 2013-07-14 | 1 | -5/+10 | |
| | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion. | |||||
| * | | | | Merge pull request #11437 from kennyj/fix_11393 | Guillermo Iguaran | 2013-07-14 | 3 | -1/+11 | |
| |\ \ \ \ | |/ / / |/| | | | Fix #11393. Fix default rendered format when calling render method without :content_type option. | |||||
| | * | | | Fix default rendered format problem when calling render method without ↵ | kennyj | 2013-07-15 | 3 | -1/+11 | |
| |/ / / | | | | | | | | | | :content_type option. Closes #11393. | |||||
| * | | | Merge pull request #11433 from arunagw/removed_unused_task | José Valim | 2013-07-14 | 1 | -13/+0 | |
| |\ \ \ | | | | | | | | | railties Rakefile tweaks | |||||
| | * | | | Removed unused require from Rakefile | Arun Agrawal | 2013-07-14 | 1 | -4/+0 | |
| | | | | | ||||||
| | * | | | Removed unused broken task for update README [ci skip] | Arun Agrawal | 2013-07-14 | 1 | -9/+0 | |
| |/ / / | ||||||
| * | | | Merge pull request #11425 from arunagw/actionview_api_generation | Xavier Noria | 2013-07-14 | 1 | -8/+7 | |
| |\ \ \ | | | | | | | | | Actionview api generation | |||||
| | * | | | Added actionview in API generation [ci skip] | Arun Agrawal | 2013-07-14 | 1 | -8/+7 | |
| | | | | | | | | | | | | | CHANGELOG and LICENSE removed as suggested | |||||
| * | | | | Merge pull request #11431 from ianfleeton/initialization_memoized_typo | Yves Senn | 2013-07-14 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | memorized -> memoized typo fix [ci skip] | |||||
| | * | | | | memorized -> memoized typo fix [ci skip] | Ian Fleeton | 2013-07-14 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | Reverts one line from 457b7ff9 | |||||
| * | | | | Merge pull request #11424 from kennyj/fix_column_defaults_caching | Santiago Pastorino | 2013-07-13 | 3 | -0/+15 | |
| |\ \ \ \ | | | | | | | | | | | Reset @column_defaults when assigning locking_column. | |||||
| | * | | | | Reset @column_defaults when assigning . | kennyj | 2013-07-14 | 3 | -0/+15 | |
| | | | | | | ||||||
| * | | | | | This is not needed anymore, before_initialize block can access config | Santiago Pastorino | 2013-07-14 | 1 | -1/+0 | |
| | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |