aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20934 from maurogeorge/migration-transformations-docSean Griffin2015-10-201-15/+51
|\
| * Add missed Available transformations to migration DocMauro George2015-07-221-15/+50
* | Merge pull request #20957 from akihiro17/find-by-issueSean Griffin2015-10-203-1/+13
|\ \
| * | Don't cache arguments in #find_by if they are an ActiveRecord::Relationakihiro172015-10-063-1/+13
* | | Merge pull request #21302 from theunraveler/delegate_reserved_argument_namesSean Griffin2015-10-202-5/+21
|\ \ \
| * | | Fixing issue when delegating to methods named "block", "args", or "arg"Jake Bell2015-08-192-5/+21
* | | | Fix test failures caused by d99db6b8b3e4Sean Griffin2015-10-201-1/+1
* | | | Merge pull request #21756 from soutaro/qualify-column-in-calculationSean Griffin2015-10-203-1/+27
|\ \ \ \
| * | | | Qualify column names in calculationSoutaro Matsumoto2015-10-203-1/+27
|/ / / /
* | | | Merge pull request #18856 from al2o3cr/issue_17897Sean Griffin2015-10-202-3/+11
|\ \ \ \
| * | | | Fix merge conflicts for #18856Sean Griffin2015-10-202-3/+11
|/| | | |
| * | | | Match table names exactly on MySQLMatt Jones2015-02-084-18/+8
* | | | | Don't add classes to the top level namespaceSean Griffin2015-10-201-13/+17
* | | | | Merge pull request #21883 from tarzan/cache-key-too-preciseSean Griffin2015-10-206-8/+43
|\ \ \ \ \
| * | | | | fixes #21815Maarten Jacobs2015-10-166-8/+43
* | | | | | Do not cache prepared statements that are unlikely to have cache hitsSean Griffin2015-10-2012-20/+69
* | | | | | Merge pull request #21932 from kamipo/add_stored_procedure_test_in_mysql2Sean Griffin2015-10-208-22/+70
|\ \ \ \ \ \
| * | | | | | Add stored procedure test in mysql2Ryuta Kamizono2015-10-156-17/+65
| * | | | | | Make `AbstractMysqlAdapter#version` publicRyuta Kamizono2015-10-152-5/+5
* | | | | | | Merge pull request #21962 from kamipo/fix_tinyblobSean Griffin2015-10-208-16/+36
|\ \ \ \ \ \ \
| * | | | | | | Fix to correctly schema dump the `tinyblob`Ryuta Kamizono2015-10-158-16/+36
* | | | | | | | Upgrade all the gemsRafael Mendonça França2015-10-201-36/+47
* | | | | | | | Merge branch 'fix-21955'Rafael Mendonça França2015-10-203-1/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Add CHANGELOG entry for fix of #21955 [ci skip]Rafael Mendonça França2015-10-201-0/+6
| * | | | | | | | Merge pull request #21974 from jbranchaud/reorder-has-many-assocation-constra...Rafael Mendonça França2015-10-202-5/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reorder application of has_many association constraints.jbranchaud2015-10-192-1/+21
| * | | | | | | | | Changed the order of Association constraints from where->order->unscope to un...kal2015-10-203-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21858 from Gaurav2728/protected_method_nodocRafael Mendonça França2015-10-201-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nodoc for active support protected method [CI skip]Gaurav Sharma2015-10-041-3/+3
* | | | | | | | | | Merge pull request #22003 from yui-knk/remove_needless_require_asYves Senn2015-10-2010-13/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Delete needless `require 'active_support/deprecation'`yui-knk2015-10-2010-13/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #22004 from yui-knk/fix_method_to_actionYves Senn2015-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Replace "destroy` method" with `destroy` action`yui-knk2015-10-201-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #21978 from ctreatma/console_helper_reloadSean Griffin2015-10-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix #21977: Removes memoization of helpers in Rails consoleCharles Treatman2015-10-161-1/+1
* | | | | | | | | | | Merge pull request #21987 from yui-knk/refactor_whereSean Griffin2015-10-193-10/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Green version of moving the handling of supported arguments to `where`yui-knk2015-10-183-10/+7
* | | | | | | | | | | | Merge pull request #22001 from cleverlemming/doc_patch_enginesSean Griffin2015-10-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | added Rails 4 context for migrations:install taskSimon H2015-10-191-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #21991 from philr/doc_tzinfo_no_longer_bundledClaudio B.2015-10-191-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove outdated statement about bundled TZInfo.Phil Ross2015-10-181-6/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #21999 from agis-/param-encoding-errorsSantiago Pastorino2015-10-194-8/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Show helpful messages on invalid param. encodingsAgis Anastasopoulos2015-10-194-8/+27
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #21988 from y-yagi/remove_useless_methodArthur Nogueira Neves2015-10-181-4/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove useless methodyuuji.yaginuma2015-10-181-4/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #21989 from imtayadeway/guides/active-model-basicsEileen M. Uchitelle2015-10-181-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Improve readability in active model basics guideTim Wade2015-10-181-7/+7
|/ / / / / / / / / /
* | | | | | | | | | Revert "Move the handling of supported arguments to `where`"Rafael Mendonça França2015-10-172-1/+3
* | | | | | | | | | Merge pull request #21982 from yui-knk/test_suppress_warningYves Senn2015-10-171-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Suppress warnings of `assigned but unused variable`yui-knk2015-10-171-2/+0