aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22338 from zacharywelch/patch-1Rafael França2015-11-191-2/+2
|\ | | | | [ci skip] Indentation in API app guide
| * [ci skip] Indentation in cache exampleszacharywelch2015-11-181-2/+2
|/
* Add missing requireMatthew Draper2015-11-191-0/+2
| | | | Fixes #22311
* 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 locking
| * Rename 'key' to 'lock_id' or 'lock_name' for advisory lockingSam Davies2015-11-188-65/+65
| | | | | | | | | | | | | | | | | | - key was a poor choice of name. A key implies something that will unlock a lock. The concept is actually more like a 'lock identifier' - mysql documentation calls this a 'lock name' - postgres documentation calls it a 'lock_id' - Updated variable names to reflect the preferred terminology for the database in question
* | Revert "Fixed a few grammar issues."Rafael Mendonça França2015-11-182-2/+2
|/ | | | | | | This reverts commit 16ce41b7f4449d6df15df30d69aef18da6510f36. Reason: See https://github.com/rails/rails/commit/16ce41b7f4449d6df15df30d69aef18da6510f36#commitcomment-14475125
* Merge pull request #22328 from k0kubun/upgrade-byebugKasper Timm Hansen2015-11-181-1/+1
|\ | | | | Use latest byebug
| * 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.
| * 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 indentation
| * [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 (817c1825c15013fd0180762ac5c05a2e0…
| * [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
|/ | | | | | In b71e08f we started raising when nil or false was passed to merge to fix #12264, however we should also do this for truthy values that are invalid like true.
* Merge pull request #22271 from ↵Yves Senn2015-11-171-0/+32
|\ | | | | | | | | | | timbreitkreutz/twb-9015-schema-dumper-test-for-prefix-and-ignore Test case for Issue #9015 - ignore_table and table_prefix at same time
| * 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 Proc
| * | Make `AR::SpawnMethods#merge!` to check an arg is a Procyui-knk2015-11-122-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Ruby ( 2.3.0dev trunk 52520), `Hash#to_proc` is defined (https://github.com/ruby/ruby/commit/fbe967ec02cb65a7efa3fb8f3d747cf6f620dde1), and many tests have been failed with `ArgumentError: wrong number of arguments (given 0, expected 1)`. Because we call `Hash#to_proc` with no args in `#merge!`. This commit changes order of conditionals to not call `Hash#to_proc`.
* | | 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
|\ \ \ | | | | | | | | send normalized keys to the cache backends so they do not need to man…
| * | | 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 ↵Michael Grosser2015-11-105-38/+37
| |/ / | | | | | | | | | this themselves
* | | 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 initi…
| * | | Except keys of `build_record`'s argument from `create_scope` in ↵yui-knk2015-11-165-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialize_attributes If argument of `build_record` has key and value which is same as default value of database, we should also except the key from `create_scope` in `initialize_attributes`. Because at first `build_record` initialize record object with argument of `build_record`, then assign attributes derived from Association's scope. In this case `record.changed` does not include the key, which value is same as default value of database, so we should add the key to except list. Fix #21893.
* | | | Merge pull request #22306 from tylerhunt/patch-1Claudio B2015-11-161-1/+1
|\ \ \ \ | | | | | | | | | | Use proper syntax for class method reference in changelog
| * | | | Use proper syntax for class method reference.Tyler Hunt2015-11-161-1/+1
|/ / / /
* | | | Merge pull request #22298 from ↵Kasper Timm Hansen2015-11-165-8/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yuki24/make-static-index-part-of-public-file-server-config Make the `config.static_index` option part of the `config.public_server` option
| * | | | Make the `static_index` config part of the `config.public_server` configYuki Nishijima2015-11-165-8/+13
| | | | | | | | | | | | | | | | | | | | Also call it `public_server.index_name` so it'll make more sense.
* | | | | Merge pull request #22302 from ↵Yves Senn2015-11-162-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_not_needed_native_database_types_entries Remove not needed `NATIVE_DATABASE_TYPES` entries
| * | | | | Remove not needed `NATIVE_DATABASE_TYPES` entriesRyuta Kamizono2015-11-162-4/+0
| | |/ / / | |/| | |
* | | | | Freeze association foreign keys to reduce allocationsSean Griffin2015-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string returned here will ultimately get used as a key of a hash in the attribute set once the attributes are being built. When you give a non-frozen string to `Hash#[]`, it will be duped. Be freezing we can significantly reduce the number of times we end up allocating `"user_id"` This does not include any additional tests, as this should not have any public facing implications. If you are mutating the result of `Reflection#foreign_key`, please stop.
* | | | | 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 doc around +maximum(:updated_at)
| * | | | [ci skip] Fix <tt> in docclaudiob2015-11-151-1/+1
|/ / / /
* | | | Merge pull request #22112 from claudix/masterXavier Noria2015-11-131-0/+21
|\ \ \ \ | |_|_|/ |/| | | Added warning on coding engine controllers [ci skip]
| * | | 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.
| * | | | [ci skip] Fix CHANGELOG.md format from list to italic.yui-knk2015-11-131-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 17:29:33 +0000