aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Use latest mysql2.Josef Šimánek2013-07-181-3/+1
|/ / / / / | | | | | | | | | | | | | | | Fixes #11457
* | | | | Merge pull request #11465 from arunagw/removed_missleading_readme_link_docXavier Noria2013-07-171-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fixed README link in API
| * | | | Fixed README link in API [ci skip]Arun Agrawal2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | This should not be a link because it's creating a link with activesupport README right now
* | | | | Merge pull request #11479 from henrikhodne/improve-ar-querymethods-includes-docsYves Senn2013-07-171-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Improve ActiveRecord::QueryMethods#includes docs [ci skip]
| * | | | | Improve ActiveRecord::QueryMethods#includes docsHenrik Hodne2013-07-171-0/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not immediately clear whether you can pass in multiple relations or not. After going through the code a bit, I saw that the arguments are just appended to an array. Also, added nested relations example. [ci skip]
* | | | | Merge pull request #11478 from newton10471/masterYves Senn2013-07-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fixes plugin test for tutorial [ci skip]
| * | | | | fixes plugin test for tutorialMatt Newton2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #11469 from bvogel/masterCarlos Antonio da Silva2013-07-174-6/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update bcrypt-ruby stable version to 3.1
| * | | | | bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-174-6/+6
| |/ / / /
* / / / / Refactor to reduce number of loopsAndrew White2013-07-171-15/+25
|/ / / / | | | | | | | | | | | | | | | | | | | | Only build the missing_keys array once we have detected that there actually are missing keys by moving the check to be part of the block that performs the path substitution.
* | | | Fix failing test missed for the past year :(Andrew White2013-07-172-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When optimized path helpers were re-introduced in d7014bc the test added in a328f2f broke but no-one noticed because it wasn't being run by the test suite. Fix the test by checking for nil values or empty strings after the args have been parameterized.
* | | | Added routing in test for actionpackArun Agrawal2013-07-171-2/+4
| | | |
* | | | Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting"Yves Senn2013-07-174-53/+6
| |_|/ |/| | | | | | | | | | | This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing changes made to 754a373e301d2df0b12a11083405252722bc8366.
* | | parent_table is only used internallyAaron Patterson2013-07-161-4/+4
| | |
* | | decouple the manager class from building join constraintsAaron Patterson2013-07-162-10/+11
| | |
* | | cache the klass member of the reflectionAaron Patterson2013-07-161-8/+10
| | |
* | | cache the scope chain on the stack and eliminate `i`Aaron Patterson2013-07-161-7/+4
| | |
* | | just push on to the scope chain items. Oops! (thanks @carlosantoniodasilva)Aaron Patterson2013-07-161-2/+1
| | |
* | | use Relation#merge to combine scope chain itemsAaron Patterson2013-07-161-6/+6
| | |
* | | make sure scope_chain_items has consistent typesAaron Patterson2013-07-161-7/+9
| | |
* | | removes the obsolete private method column_methods_hash [Closes #11406]Xavier Noria2013-07-164-43/+28
| | |
* | | Skip Rack applications and redirects when generating urlsAndrew White2013-07-166-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_fileCarlos Antonio da Silva2013-07-161-1/+1
|\ \ \ | | | | | | | | Fixed USAGE file for generator [ci skip]
| * | | Fixed USAGE file for generator [ci skip]Arun Agrawal2013-07-161-1/+1
|/ / /
* | | Merge pull request #11435 from kennyj/move_to_query_cacheYves Senn2013-07-162-2/+6
|\ \ \ | | | | | | | | Move initializing process for @query_cache to QueryCache module.
| * | | Move initializing process for query cache to ↵kennyj2013-07-162-2/+6
| | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::QueryCache module.
* | | | Merge pull request #11120 from awilliams/ar_mysql2_boolean_quotingYves Senn2013-07-164-6/+53
|\| | | | | | | | | | | Fixes AR mysql2 adapter incorrectly casting boolean values
| * | | Unifies mysql and mysql2 casting of booleansawilliams2013-07-164-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 Senn2013-07-163-2/+19
| | |
* | | Merge pull request #11419 from simi/generator_generator_testGuillermo Iguaran2013-07-168-1/+72
|\ \ \ | | | | | | | | Added generated unit test for generator generator.
| * | | Added generated unit test for generator generator and new test:generators ↵Josef Šimánek2013-07-168-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 Iguaran2013-07-161-1/+3
| | | | | | | | | | | | #11457 for details
* | | save another array allocationAaron Patterson2013-07-151-1/+1
| | |
* | | removing useless assingmentAaron Patterson2013-07-151-1/+1
| | |
* | | reorder bind parameters when merging relationsAaron Patterson2013-07-153-3/+43
| | |
* | | use arel rather than slapping together SQL stringsAaron Patterson2013-07-152-5/+10
| | |
* | | Merge pull request #11451 from ↵Yves Senn2013-07-152-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 objectPaul Nikitochkin2013-07-152-0/+8
| | | | | | | | | | | | | | | | Closes #11450
* | | | Merge pull request #11282 from ↵Yves Senn2013-07-153-29/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | arunagw/deprecation-removed-attribute-missing-activerecord Remove deprecated `attribute_missing`.
| * | | | Remove deprecation warning from attribute_missing Arun Agrawal2013-07-153-29/+4
| |/ / / | | | | | | | | for attributes that are columns.
* | | | Merge pull request #11448 from arunagw/updated_middleware_testYves Senn2013-07-151-1/+3
|\ \ \ \ | |/ / / |/| | | No need to add config for x_sendfile_header
| * | | Added CheckPending middleware in defaultArun Agrawal2013-07-151-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_headerArun Agrawal2013-07-151-2/+0
|/ / / | | | | | | | | | Rack::Sendfile is loaded by default now
* | | Rack::Sendfile is now included in middleware by default, change tests to ↵Guillermo Iguaran2013-07-151-10/+4
| | | | | | | | | | | | reflect that
* | | Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"Santiago Pastorino2013-07-151-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_bugfixSantiago Pastorino2013-07-143-3/+23
|\ \ \ | | | | | | | | Remove extra decrement of transaction level
| * | | #4566: Remove extra decrement of transaction levelPaul Nikitochkin2013-07-143-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-nodesYves Senn2013-07-142-1/+8
|\ \ \ \ | | | | | | | | | | Blacklist->whitelist for reference scans in order!
| * | | | Blacklist->whitelist for reference scans in order!Ernie Miller2013-07-142-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 Senn2013-07-141-5/+10
| | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 00:55:17 +0000