aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Indentation in cache exampleszacharywelch2015-11-181-2/+2
* Add missing requireMatthew Draper2015-11-191-0/+2
* Merge pull request #22330 from samphilipd/samphilipd/rename_advisory_lock_keyRafael França2015-11-188-65/+65
|\
| * Rename 'key' to 'lock_id' or 'lock_name' for advisory lockingSam Davies2015-11-188-65/+65
* | Revert "Fixed a few grammar issues."Rafael Mendonça França2015-11-182-2/+2
|/
* Merge pull request #22328 from k0kubun/upgrade-byebugKasper Timm Hansen2015-11-181-1/+1
|\
| * Use latest byebugTakashi Kokubun2015-11-181-1/+1
* | Merge pull request #22326 from mvj3/minor-grammar-issuesRafael França2015-11-182-2/+2
|\ \ | |/ |/|
| * Fixed a few grammar issues.David Chen2015-11-182-2/+2
|/
* Merge pull request #22323 from jessedoyle/patch-1Claudio B2015-11-171-1/+1
|\
| * [ci skip] fix inconsistent indentationJesse Doyle2015-11-171-1/+1
|/
* Fix incorrect issue number [ci skip]Andrew White2015-11-171-1/+1
* Merge pull request #22316 from yui-knk/changelog_for_22300Andrew White2015-11-171-0/+6
|\
| * [ci skip] Add CHANGELOG for #22300 (817c1825c15013fd0180762ac5c05a2e024a640d)yui-knk2015-11-181-0/+6
* | Raise ArgumentError when passing a truthy value to mergeAndrew White2015-11-172-5/+10
|/
* Merge pull request #22271 from timbreitkreutz/twb-9015-schema-dumper-test-for...Yves Senn2015-11-171-0/+32
|\
| * TWB Test case for Issue #9015 - ignore_table and table_prefix at same timeTim Breitkreutz2015-11-131-0/+32
* | Merge pull request #22257 from yui-knk/fix_merge_to_not_call_to_proc_for_hashAndrew White2015-11-172-3/+9
|\ \
| * | Make `AR::SpawnMethods#merge!` to check an arg is a Procyui-knk2015-11-122-3/+9
* | | Using released concurrent-rubyRafael Mendonça França2015-11-162-3/+3
* | | Merge pull request #22215 from grosser/grosser/normalize_keyRafael França2015-11-165-39/+39
|\ \ \
| * | | keep deprecated namespaced_key in case any subclass uses itMichael Grosser2015-11-103-2/+3
| * | | send normalized keys to the cache backends so they do not need to manage this...Michael Grosser2015-11-105-38/+37
| |/ /
* | | Merge pull request #22300 from yui-knk/fix_21893Sean Griffin2015-11-165-5/+23
|\ \ \
| * | | Except keys of `build_record`'s argument from `create_scope` in initialize_at...yui-knk2015-11-165-5/+23
* | | | Merge pull request #22306 from tylerhunt/patch-1Claudio B2015-11-161-1/+1
|\ \ \ \
| * | | | Use proper syntax for class method reference.Tyler Hunt2015-11-161-1/+1
|/ / / /
* | | | Merge pull request #22298 from yuki24/make-static-index-part-of-public-file-s...Kasper Timm Hansen2015-11-165-8/+13
|\ \ \ \
| * | | | Make the `static_index` config part of the `config.public_server` configYuki Nishijima2015-11-165-8/+13
* | | | | Merge pull request #22302 from kamipo/remove_not_needed_native_database_types...Yves Senn2015-11-162-4/+0
|\ \ \ \ \
| * | | | | Remove not needed `NATIVE_DATABASE_TYPES` entriesRyuta Kamizono2015-11-162-4/+0
| | |/ / / | |/| | |
* | | | | Freeze association foreign keys to reduce allocationsSean Griffin2015-11-151-1/+1
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-11-153-8/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | copy edits [ci skip]Vijay Dev2015-11-151-12/+6
| * | | | [ci skip] Use full component name in public API documentyui-knk2015-11-151-1/+1
| * | | | adding missing `.` Gaurav Sharma2015-11-151-5/+5
| * | | | rollback changes to changelogGaurish Sharma2015-11-141-4/+0
| * | | | Grammer & Style Tweaks as per feedbackGaurish Sharma2015-11-142-4/+5
| * | | | Document time testing helpersGaurish Sharma2015-11-092-0/+31
| * | | | :nailcare: Grammer fixesGaurish Sharma2015-11-091-2/+2
* | | | | Merge pull request #22299 from claudiob/fix-doc-ttClaudio B2015-11-151-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Fix <tt> in docclaudiob2015-11-151-1/+1
|/ / / /
* | | | Merge pull request #22112 from claudix/masterXavier Noria2015-11-131-0/+21
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improved explanationClaudi Martinez2015-11-131-4/+1
| * | | Improved explanationClaudi Martinez2015-11-011-10/+16
| * | | Fixed typoClaudi Martinez2015-10-291-1/+1
| * | | Added warning on coding engine controllersClaudi Martinez2015-10-291-0/+18
* | | | Merge pull request #22280 from yui-knk/fix_chagnelog_actionviewRichard Schneeman2015-11-121-1/+1
|\ \ \ \
| * | | | [ci skip] Fix CHANGELOG.md format from list to italic.yui-knk2015-11-131-1/+1
* | | | | Merge pull request #22279 from yui-knk/fix_object_partial_falseRichard Schneeman2015-11-124-1/+10
|\ \ \ \ \ | |/ / / / |/| | | |