aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix examples of number_to_percentageRafael Mendonça França2013-07-181-8/+8
* Merge pull request #11483 from garysweaver/grammar_fix_in_upgrade_documentationSantiago Pastorino2013-07-171-1/+1
|\
| * grammar fix in upgrade documentationGary S. Weaver2013-07-171-1/+1
* | Merge pull request #11485 from simi/mysql2Guillermo Iguaran2013-07-171-3/+1
|\ \
| * | Use latest mysql2.Josef Šimánek2013-07-181-3/+1
|/ /
* | Merge pull request #11465 from arunagw/removed_missleading_readme_link_docXavier Noria2013-07-171-1/+1
|\ \ | |/ |/|
| * Fixed README link in API [ci skip]Arun Agrawal2013-07-171-1/+1
* | Merge pull request #11479 from henrikhodne/improve-ar-querymethods-includes-docsYves Senn2013-07-171-0/+8
|\ \
| * | Improve ActiveRecord::QueryMethods#includes docsHenrik Hodne2013-07-171-0/+8
|/ /
* | Merge pull request #11478 from newton10471/masterYves Senn2013-07-171-1/+1
|\ \
| * | fixes plugin test for tutorialMatt Newton2013-07-171-1/+1
* | | Merge pull request #11469 from bvogel/masterCarlos Antonio da Silva2013-07-174-6/+6
|\ \ \ | |/ / |/| |
| * | bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-174-6/+6
| |/
* / Refactor to reduce number of loopsAndrew White2013-07-171-15/+25
|/
* Fix failing test missed for the past year :(Andrew White2013-07-172-3/+18
* 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
* 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
* Merge pull request #11458 from arunagw/fix_usage_fileCarlos Antonio da Silva2013-07-161-1/+1
|\
| * 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 ActiveRecord::ConnectionAdapters...kennyj2013-07-162-2/+6
* | Merge pull request #11120 from awilliams/ar_mysql2_boolean_quotingYves Senn2013-07-164-6/+53
|\|
| * Unifies mysql and mysql2 casting of booleansawilliams2013-07-164-6/+53
|/
* `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 and new test:generators rak...Josef Šimánek2013-07-168-1/+72
|/
* Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check #11457...Guillermo Iguaran2013-07-161-1/+3
* 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 jetthoughts/11450_do_not_resave_destroyed_asso...Yves Senn2013-07-152-0/+8
|\
| * Do not re-save destroyed association on saving parent objectPaul Nikitochkin2013-07-152-0/+8
* | Merge pull request #11282 from arunagw/deprecation-removed-attribute-missing-...Yves Senn2013-07-153-29/+4
|\ \
| * | Remove deprecation warning from attribute_missing Arun Agrawal2013-07-153-29/+4
| |/
* | Merge pull request #11448 from arunagw/updated_middleware_testYves Senn2013-07-151-1/+3
|\ \ | |/ |/|
| * Added CheckPending middleware in defaultArun Agrawal2013-07-151-0/+4
| * No need to add config for x_sendfile_headerArun Agrawal2013-07-151-2/+0
|/
* Rack::Sendfile is now included in middleware by default, change tests to refl...Guillermo Iguaran2013-07-151-10/+4
* Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"Santiago Pastorino2013-07-151-3/+1
* Merge pull request #11434 from jetthoughts/new_save_transaction_bugfixSantiago Pastorino2013-07-143-3/+23
|\