aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-012-2/+33
|\ \ \ \ \
| * | | | | Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-012-2/+33
* | | | | | Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
* | | | | | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4
* | | | | | Simplify filter normalization.Kasper Timm Hansen2016-02-011-5/+3
* | | | | | Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-017-30/+163
|\ \ \ \ \ \
| * | | | | | Add options for rake routes taskVipul A M2016-02-027-30/+163
* | | | | | | Revert "Merge pull request #16400 from bogdan/last-with-sql"Sean Griffin2016-02-013-60/+31
* | | | | | | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-024-23/+119
|\ \ \ \ \ \ \
| * | | | | | | After completing a load, give other threads a chance tooMatthew Draper2016-02-023-15/+46
| * | | | | | | While new sharers are blocked, an existing sharer remains re-entrantMatthew Draper2016-02-022-1/+30
| * | | | | | | Block new share attempts if there's an exclusive waiterMatthew Draper2016-02-022-8/+44
| * | | | | | | Always obtain the lock and do the unloadMatthew Draper2016-02-021-1/+1
* | | | | | | | Merge pull request #23406 from hackerkid/masterVipul A M2016-02-021-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | .git added to https repo urlsVishnu Ks2016-02-021-5/+5
* | | | | | | | | Merge pull request #23151 from maclover7/fix-23148Rafael França2016-02-012-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation for #17573Jon Moss2016-02-012-0/+11
* | | | | | | | | | Merge pull request #23402 from hackerkid/masterRichard Schneeman2016-02-011-5/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | git protocol replaced with httpsVishnu Ks2016-02-021-5/+5
* | | | | | | | | Merge pull request #23025 from yahonda/shorten_internal_metadata_table_name_l...Sean Griffin2016-02-016-14/+42
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Rename `active_record_internal_metadatas` to `ar_internal_metadata`Yasuo Honda2016-02-012-0/+28
| * | | | | | | | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadataYasuo Honda2016-02-015-14/+14
| |/ / / / / / /
* | | | | | | | Merge pull request #23401 from claudiob/fix-as-changelog-mdClaudio B2016-02-011-29/+29
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | [ci skip] Properly indent code in markdownclaudiob2016-02-011-29/+29
|/ / / / / / /
* | | | | | | Merge pull request #23057 from schneems/schneems/default-puma-configRichard Schneeman2016-02-015-3/+64
|\ \ \ \ \ \ \
| * | | | | | | Add Default Puma Configschneems2016-01-295-3/+64
* | | | | | | | Merge pull request #23385 from matthewd/default-subscription-adapterMatthew Draper2016-02-021-4/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use the in-process subscription adapter for development & testMatthew Draper2016-02-011-4/+2
* | | | | | | | Merge pull request #23381 from matthewd/uneventful-redisMatthew Draper2016-02-028-35/+212
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Switch the default redis adapter to a single-stream modelMatthew Draper2016-02-018-35/+212
* | | | | | | | Merge pull request #23375 from prathamesh-sonpatki/fix-19835Rafael França2016-02-012-13/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix documentation related to `config.assets.cache_store` [ci skip]Prathamesh Sonpatki2016-02-012-13/+6
* | | | | | | | tabenai (typo)Akira Matsuda2016-02-011-6/+6
* | | | | | | | Merge pull request #23391 from erullmann/join_table_indexesRafael França2016-02-011-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Added references option to join tablesErnst Rullmann2016-01-311-0/+4
* | | | | | | | | Merge pull request #23168 from kamipo/avoid_extra_show_variables_in_migrationRafael França2016-02-015-21/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Avoid extra `show variables` in migrationRyuta Kamizono2016-02-015-21/+15
|/ / / / / / / /
* | | | | | | | Merge pull request #23359 from kamipo/make_to_primary_keyRafael França2016-02-014-40/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Make to primary key instead of an unique index for internal tablesRyuta Kamizono2016-01-314-40/+5
* | | | | | | | | Remove development dependencies from actioncable.gemspecMatthew Draper2016-02-011-9/+0
* | | | | | | | | Merge pull request #23373 from kamipo/remove_duplicated_composite_primary_key...Rafael França2016-02-013-17/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicated composite primary key testsRyuta Kamizono2016-02-013-17/+1
* | | | | | | | | | Merge pull request #23389 from kamipo/extract_explain_pretty_printerRafael França2016-02-017-119/+137
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Extract `ExplainPrettyPrinter` to appropriate filesRyuta Kamizono2016-02-017-119/+137
| |/ / / / / / / / /
* / / / / / / / / / Revert "Merge pull request #23366 from maclover7/add-configuation-ar-docs"Rafael Mendonça França2016-02-011-102/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23372 from kamipo/use_index_in_create_in_test_schemaRafael França2016-02-012-11/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use `t.index` in `create_table` instead of `add_index` in test schemaRyuta Kamizono2016-01-312-11/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #23374 from prathamesh-sonpatki/migration-compatiblity-testsRafael França2016-01-311-0/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added test for backward compatibility of null constraints on timestamp columnsPrathamesh Sonpatki2016-01-311-0/+30
| |/ / / / / / / /
* | | | | | | | | :speak_no_evil: :warning:Akira Matsuda2016-02-012-2/+6