aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move the warning about composite primary key to `AttributeMethods::PrimaryKey`Ryuta Kamizono2016-07-027-20/+39
* Try the newest bundlerRafael Mendonça França2016-07-021-4/+0
* Merge pull request #25639 from y-yagi/followup_to_25431Rafael França2016-07-021-1/+1
|\
| * fix task name to removeyuuji.yaginuma2016-07-021-1/+1
|/
* Merge pull request #25507 from bquorning/optimize-for-first-result-and-remove...Rafael França2016-07-023-14/+17
|\
| * Optimize ActiveRecord::Result#lastBenjamin Quorning2016-06-242-1/+7
| * Remove MySQL::DatabaseStatements#select_oneBenjamin Quorning2016-06-241-13/+0
| * Add ActiveRecord::Result#firstBenjamin Quorning2016-06-242-0/+10
* | Merge pull request #24177 from vipulnsward/rename-testRafael França2016-07-011-1/+1
|\ \
| * | - Renamed NestedParametersTest to NestedParametersPermitTest, to indicate wha...Vipul A M2016-03-131-1/+1
* | | Merge pull request #25631 from yahonda/revert_rename_to_ar_internal_metadataRafael França2016-07-012-28/+0
|\ \ \
| * | | Revert "Rename `active_record_internal_metadatas` to `ar_internal_metadata`"Yasuo Honda2016-07-012-28/+0
* | | | Merge pull request #25633 from kamipo/remove_create_table_info_cacheRafael França2016-07-011-6/+1
|\ \ \ \
| * | | | Remove `create_table_info_cache` because it not be reusedRyuta Kamizono2016-07-021-6/+1
| |/ / /
* | | | Do not run `bundle install` when generating a new plugin.Rafael Mendonça França2016-07-016-103/+112
* | | | Merge pull request #25625 from voxik/fix-rails-test-git-layoutRafael França2016-07-011-2/+2
|\ \ \ \
| * | | | Do not depend on Rails git repository layout in ActiveSupport tests.Vít Ondruch2016-07-011-2/+2
* | | | | Merge pull request #25620 from kamipo/create_without_primary_keyRafael França2016-07-012-1/+9
|\ \ \ \ \
| * | | | | Pass `pk: false` to `connection.insert` explicitly if do not have a primary keyRyuta Kamizono2016-07-012-1/+9
| |/ / / /
* | | | | Fix conditional order broken in ea40ec56.Kasper Timm Hansen2016-07-021-2/+2
* | | | | Merge pull request #25344 from matthewd/debug-locksMatthew Draper2016-07-024-5/+172
|\ \ \ \ \
| * | | | | Provide a middleware to debug misbehaving locksMatthew Draper2016-06-104-5/+172
* | | | | | Merge pull request #24146 from matthewd/latch-as-proxyMatthew Draper2016-07-021-5/+12
|\ \ \ \ \ \
| * | | | | | Don't inherit from Concurrent::CountDownLatchMatthew Draper2016-03-111-5/+12
* | | | | | | Merge pull request #25615 from tinco/close_hijacked_socketMatthew Draper2016-07-022-0/+15
|\ \ \ \ \ \ \
| * | | | | | | close hijacked i/o socket after use (fixes #25613)Tinco Andringa2016-07-012-0/+15
* | | | | | | | Ensure logging on exceptions only includes what we expectMatthew Draper2016-07-021-0/+23
* | | | | | | | Silence DebugExceptions template render logs during exceptionsGenadi Samokovarov2016-07-021-0/+8
* | | | | | | | Make mutation stand out some more.Kasper Timm Hansen2016-07-011-2/+5
* | | | | | | | Merge pull request #25632 from volmer/fix-integration-test-frozen-literalsKasper Timm Hansen2016-07-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix request encoding in tests when string literals are frozenVolmer2016-07-011-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #25600 from pan/constantize-docfixVipul A M2016-07-011-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix ActiveSupport::Infector.constantize usage API doc [ci skip]Pan GaoYong2016-06-301-4/+4
* | | | | | | | Add regression test for foreign key schema dump cachingeileencodes2016-07-011-0/+13
* | | | | | | | Merge pull request #25307 from kamipo/extract_foreign_key_action_from_informa...Eileen M. Uchitelle2016-07-015-36/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Extract foreign key action from `information_schema`Ryuta Kamizono2016-06-074-34/+44
| * | | | | | | | Make `foreign_keys` queries to `SCHEMA`Ryuta Kamizono2016-06-072-2/+2
* | | | | | | | | Fix release task now that NPM is part of the buildeileencodes2016-07-011-18/+22
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #25618 from kamipo/fix_release_notesRafael França2016-07-011-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Deprecation passing of `start` value was removed [ci skip]Ryuta Kamizono2016-07-011-4/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #25582 from alexcameron89/action_controller_baseप्रथमेश Sonpatki2016-07-011-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Add 'params' formatting in ActionController::BaseAlex Kitchens2016-06-301-4/+4
* | | | | | | | | Merge pull request #25553 from vipulnsward/25543-docs-follow-upVipul A M2016-06-301-16/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | - Tone down documentationVipul A M2016-06-281-16/+7
* | | | | | | | | | Merge pull request #25431 from prathamesh-sonpatki/add-note-about-upgrade-gui...Rafael França2016-06-302-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Display link to Rails upgrade guide at the end of `rails app:update` task.Prathamesh Sonpatki2016-06-302-1/+10
* | | | | | | | | | | Use sass-rails in our test suiteRafael Mendonça França2016-06-303-1/+10
* | | | | | | | | | | Merge pull request #25612 from vipulnsward/publish-testing-guideRafael França2016-06-301-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mark Testing Guide as pubished and reword the title[ci skip]Vipul A M2016-06-301-2/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #25611 from alexcameron89/upgrading_rails_guideVipul A M2016-06-301-16/+16
|\ \ \ \ \ \ \ \ \ \ \