aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23869 from oreoshake/to-sentence-html-safetyRafael França2016-04-202-0/+85
|\ | | | | Add html_safe support to ActionView Array#OutputSafetyHelper
| * mimic ActiveSupport's Array#to_sentence in an html_safe-aware wayNeil Matatall2016-03-152-0/+85
| |
* | Ensure Cache#inspect doesn't block concurrent cache writesJeremy Daer2016-04-192-0/+11
| | | | | | | | | | | | | | Object#inspect recursively inspects instance variables, exposing all internal state, including sensitive internal cache objects. Override Cache#inspect to give a high-level summary that never interferes with concurrent cache writes.
* | Merge pull request #24640 from kamipo/fix_test_blank_columns_created_in_blockRafael França2016-04-191-1/+1
|\ \ | | | | | | Fix `test_blank_columns_created_in_block`
| * | Fix `test_blank_columns_created_in_block`Ryuta Kamizono2016-04-201-1/+1
|/ / | | | | | | Follow up to 1683410.
* | Merge pull request #24031 from ↵Jeremy Daer2016-04-192-2/+14
|\ \ | | | | | | | | | | | | | | | samphilipd/sam/do_not_clobber_options_in_route_definitions Do not destructively mutate passed options hash in route definitions
| * | Do not destructively mutate passed options hash in route definitionsSam Davies2016-03-032-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes #24030 An example scope might be specified as such: ```ruby HTML = { constraints: { format: :html } }.freeze scope HTML do get 'x' end ``` This currently raises an error because the mapper attempts to destructively modify the passed options hash. This is dangerous because this options hash might even be shared with other scopes. We should instead always instantiate a new object instead of modifying the passed options.
* | | Merge pull request #24619 from BenMorganIO/use-rails-5-in-rails-engine-binYves Senn2016-04-191-1/+2
|\ \ \ | | | | | | | | remove rails 4 specification in bin/rails for plugins [ci skip]
| * | | mention rails 5 instead of rails 4 in bin/rails for pluginsBen A. Morgan2016-04-191-1/+2
| | | |
* | | | Merge pull request #24638 from maclover7/jm-rm-commentKasper Timm Hansen2016-04-191-1/+1
|\ \ \ \ | | | | | | | | | | Remove unecessary comment
| * | | | Remove unecessary commentJon Moss2016-04-191-1/+1
|/ / / /
* | | | Database comments: Treat blank comments as no comment. Don't dump blank ↵Jeremy Daer2016-04-193-57/+98
| | | | | | | | | | | | | | | | comments.
* | | | Merge pull request #24635 from mohitnatoo/doc-queue-adapterVipul A M2016-04-201-0/+12
|\ \ \ \ | | | | | | | | | | Added documentation for ActiveJob queue adapter for a specific job. [ci skip]
| * | | | - Added documentation for ActiveJob queue adapter for a specific job.Mohit Natoo2016-04-201-0/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Added note on child class maintaining parent's queue adapter. [ci skip] Added note on child class maintaining parent's queue adapter. [ci skip] removed documentation for child class inheriting the queue adapter.
* | | | Merge pull request #24634 from kamipo/arel_visitors_definitions_was_removedRafael França2016-04-194-1/+13
|\ \ \ \ | | | | | | | | | | Define `arel_visitor` method on all adapters
| * | | | Define `arel_visitor` method on all adaptersRyuta Kamizono2016-04-204-1/+13
|/ / / / | | | | | | | | | | | | `Arel::Visitors::VISITORS` was removed at https://github.com/rails/arel/pull/412.
* | | | Merge pull request #24567 from Edouard-chin/ec-method-typoSean Griffin2016-04-191-2/+2
|\ \ \ \ | | | | | | | | | | Small typo on a method name:
| * | | | Small typo on a method name:Edouard CHIN2016-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | - clear_test_deliviers -> clear_test_deliveries
* | | | | Merge pull request #24632 from vipulnsward/rm-reference-to-methodSantiago Pastorino2016-04-191-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove reference to unknown method `dirty?` in docs [ci skip]
| * | | | | Remove reference to unknown method `dirty?` to docsVipul A M2016-04-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #24630 from aried3r/patch-1Vipul A M2016-04-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update send_data documentation [ci skip]
| * | | | | | Update send_data documentation [ci skip]Anton Rieder2016-04-191-1/+1
|/ / / / / / | | | | | | | | | | | | Add missing period after sentence.
* | | | | | Merge pull request #24626 from JustinJruby/masterJon Moss2016-04-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Change the Hash.to_xml with a lamda example
| * | | | | Change the Hash.to_xml with a lamda example Justin2016-04-191-1/+1
|/ / / / / | | | | | | | | | | | | | | | Update 'foo'.to_xml(lambda { |options, key| options[:builder].b(key) }) to {foo: lambda { |options, key| options[:builder].b(key) }}.to_xml
* | | | | Merge pull request #24621 from kamipo/remove_unused_table_with_autoincrementJeremy Daer2016-04-191-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unused `table_with_autoincrement` table
| * | | | | Remove unused `table_with_autoincrement` tableRyuta Kamizono2016-04-191-4/+0
|/ / / / /
* | | | | Merge pull request #24317 from Gaurav2728/unused_set_in_active_recordJeremy Daer2016-04-192-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | connection adapters column, delegation in Active Record have not use …
| * | | | | connection adapters column, delegation in Active Record have not use of ↵Gaurav Sharma2016-03-312-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ‘set’ found these commits https://github.com/rails/rails/commit/9cc8c6f3730df3d94c81a55be9ee1b7b4ffd29f6, https://github.com/rails/rails/commit/9d79334a1dee67e31222c790e231772deafcaeb8 that also should remove it.
* | | | | | Merge pull request #24503 from ↵Jeremy Daer2016-04-191-11/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/add-test-for-warn-on-records-fetched-greater-than Add missing test case for record_fetched_greater_than config
| * | | | | | Add missing test case for record_fetched_greater_than configPrathamesh Sonpatki2016-04-111-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - The negative scenario test case was missing earlier.
* | | | | | | Merge pull request #24576 from yahonda/quote_column_name_for_reserved_word_sizeJeremy Daer2016-04-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Address ORA-00923 error by quoting a reserved word "SIZE"
| * | | | | | | Address ORA-00923 error by quoting a reserved word "SIZE"Yasuo Honda2016-04-161-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Ruby 2.4 Array#sum: ficauses -> cases changelog typo [ci skip]Jeremy Daer2016-04-191-1/+1
| | | | | | |
* | | | | | | Ruby 2.4 Array#sum: fix non-numeric #sum feature detectionJeremy Daer2016-04-191-1/+1
| | | | | | |
* | | | | | | Merge pull request #24552 from yui-knk/raise_argument_errorJeremy Daer2016-04-192-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Raise `ArgumentError` when an invalid form is passed to `Date#to_time`
| * | | | | | | Raise `ArgumentError` when an invalid form is passed to `Date#to_time`yui-knk2016-04-172-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit `NoMethodError: undefined method `form_name' for Time:Class` is raised when an invalid argument is passed. It is better to raise `ArgumentError` and show list of valid arguments to developers.
* | | | | | | | Merge pull request #23497 from kamipo/extract_schema_qualified_nameJeremy Daer2016-04-191-8/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract `extract_schema_qualified_name` method
| * | | | | | | | Extract `extract_schema_qualified_name` methodRyuta Kamizono2016-02-051-8/+15
| | | | | | | | |
* | | | | | | | | Merge pull request #23515 from kamipo/extract_arel_visitorJeremy Daer2016-04-194-28/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract `arel_visitor` and move up to the abstract adapter
| * | | | | | | | | Extract `arel_visitor` and move up to the abstract adapterRyuta Kamizono2016-04-044-28/+12
| | | | | | | | | |
* | | | | | | | | | Travis: cache unicode data downloads and beanstalkd buildJeremy Daer2016-04-194-17/+29
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Cable: Extract stream handler constructionJeremy Daer2016-04-186-25/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use separate stream handler builders for easy override and testing. * Fix worker pool execution that was silently failing since it only expected connection receivers. Sparked by code in #24162.
* | | | | | | | | Ruby 2.4: compat with new Array#sumJeremy Daer2016-04-183-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.4 introduces `Array#sum`, but it only supports numeric elements, breaking our `Enumerable#sum` which supports arbitrary `Object#+`. To fix, override `Array#sum` with our compatible implementation. Native Ruby 2.4: %w[ a b ].sum # => TypeError: String can't be coerced into Fixnum With `Enumerable#sum` shim: %w[ a b ].sum # => 'ab' We tried shimming the fast path and falling back to the compatible path if it fails, but that ends up slower even in simple causes due to the cost of exception handling. Our only choice is to override the native `Array#sum` with our `Enumerable#sum`.
* | | | | | | | | Merge pull request #23523 from kamipo/avoid_truncation_in_uniqueness_validationJeremy Daer2016-04-183-13/+49
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid a string value truncation in uniqueness validation
| * | | | | | | | | Avoid a string value truncation in uniqueness validationRyuta Kamizono2016-02-122-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MySQL, PostgreSQL, Oracle and SQLServer, a value over the limit cannot be inserted or updated (See #23522). In SQLite3, a value is inserted or updated regardless of the limit. We should avoid a string value truncation in uniqueness validation.
* | | | | | | | | | Merge pull request #23522 from kamipo/add_value_too_long_exception_classJeremy Daer2016-04-185-0/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `ActiveRecord::ValueTooLong` exception class
| * | | | | | | | | | Add `ActiveRecord::ValueTooLong` exception classRyuta Kamizono2016-02-064-0/+18
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #24614 from ↵Jeremy Daer2016-04-184-2/+39
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/foreign_key_respects_table_name_prefix_and_suffix `foreign_key` respects `table_name_prefix` and `table_name_suffix`
| * | | | | | | | | | | `foreign_key` respects `table_name_prefix` and `table_name_suffix`Ryuta Kamizono2016-04-193-2/+35
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #24615 from vipulnsward/16917-release-notesSantiago Pastorino2016-04-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add #16917 to release notes