aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #22355 from yui-knk/remove_arity_checkKasper Timm Hansen2015-11-202-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Remove arity check for `RouteSet#draw`yui-knk2015-11-212-10/+0
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #22332 from grosser/grosser/deprecationRafael França2015-11-206-4/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | add deprecations for a smooth transition after #22215Michael Grosser2015-11-196-4/+72
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #22347 from kamipo/fix_test_index_in_createSean Griffin2015-11-192-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix test failure in `adapters/mysql/active_schema_test.rb`Ryuta Kamizono2015-11-202-6/+6
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Revert "Allow specifying the default table options for mysql adapters"Sean Griffin2015-11-193-26/+1
* | | | | | | | | | | | | | | | | | | | | Allow specifying the default table options for mysql adaptersSean Griffin2015-11-193-1/+26
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22336 from tjschuck/enumerable_sum_perfKasper Timm Hansen2015-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Change Enumerable#sum to use inject(:sym) specificationT.J. Schuck2015-11-191-1/+1
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge pull request #22340 from rbr/change-configuration-exampleYves Senn2015-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Change configuration-guide examplerbr2015-11-191-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22342 from AlexVPopov/patch-1Abdelkader Boudih2015-11-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix a typoAlex Popov2015-11-191-1/+1
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22077 from obduk/clean-up-logsKasper Timm Hansen2015-11-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove newlines from start of logsOwen Davies2015-10-261-3/+3
* | | | | | | | | | | | | | | | | | | | | guides, scaffold no longer used in getting started guide. Closes #22337.Yves Senn2015-11-191-6/+24
* | | | | | | | | | | | | | | | | | | | | Merge pull request #22338 from zacharywelch/patch-1Rafael França2015-11-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | [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