aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #32336 from vincedevendra/allow_mutating_dig_return_valueAaron Patterson2018-04-022-1/+10
|\ \ \ \ | | | | | | | | | | Make mutating params#dig return value mutate underlying params
| * | | | Make mutating params#dig mutate underlying paramsVince DeVendra2018-03-242-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When #dig was called on a params object and return either a Hash or an Array, and that value was subsquently mutated, it would not modify the containing params object. That means that the behavior of `params.dig(:a, :b)[:c] = 1` did not match either `params[:a][:b][:c] = 1` nor `hash.dig(:a, :b)[:c] = 1`. Similarly to `ActionController::Parameters#[]`, use `#convert_hashes_to_parameters` to pre-convert values and insert them in the receiving params object prior to returning them.
* | | | | Merge pull request #32404 from mathieumahe/masterGuillermo Iguaran2018-04-023-1/+39
|\ \ \ \ \ | | | | | | | | | | | | Extract the confirm call in its own, overridable method in rails_ujs
| * | | | | Extract the confirm call in its own, overridable method in rails_ujsMathieu2018-04-013-1/+39
| | | | | |
* | | | | | Merge pull request #32415 from kamipo/remove_foreign_keys_moduleGuillermo Iguaran2018-04-024-15/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove `ForeignKeys` module which was introduced at #32299
| * | | | | | Remove `ForeignKeys` module which was introduced at #32299Ryuta Kamizono2018-04-024-15/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To solve the problem #32299, just enough to introduce `fk_ignore_pattern` option. I don't think there is a need to expose these constants.
* | | | | | Merge pull request #32416 from yhirano55/not_generate_needless_files_in_guidesRafael França2018-04-021-25/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Not generate needless files in guides
| * | | | | | Not generate needless files in guidesYoshiyuki Hirano2018-04-021-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not generate needless files: * _license.html.erb, _welcome.html.erb are partial files. * layout.html.erb is the layout file.
* | | | | | | [ci skip] Fully quantify Active Record module in changelog.Kasper Timm Hansen2018-04-021-1/+1
| | | | | | |
* | | | | | | Merge pull request #32417 from bogdan/base-classKasper Timm Hansen2018-04-028-9/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add AR::Base.base_class? predicate
| * | | | | | | Add AR::Base.base_class? predicateBogdan Gusiev2018-04-028-9/+27
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #32065 from ↵Kasper Timm Hansen2018-04-026-130/+137
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | sikachu/move-SourceAnnotationExtractor-under-rails-namespec Move SourceAnnotationExtractor under Rails module
| * | | | | | Run `bundle update` on bootsnapPrem Sichanugrist2018-03-231-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.2.1 fixes a bug in `Kernel.require` and resolve a test failure. See https://github.com/Shopify/bootsnap/pull/143
| * | | | | | Add deprecation note for SourceAnnotationExtractorPrem Sichanugrist2018-03-221-0/+7
| | | | | | |
| * | | | | | Make Annotation into a proper classPrem Sichanugrist2018-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the documentation for SourceAnnotationExtractor because RDoc does not seems to know how to parse `Struct.new() do` block.
| * | | | | | Move SourceAnnotationExtractor under Rails modulePrem Sichanugrist2018-03-225-123/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This class should be under Rails module as it belongs to Rails.
* | | | | | | Merge pull request #32407 from razh/fix-rails-ujs-html-content-testYuji Yaginuma2018-04-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo in rails-ujs HTML content test
| * | | | | | | Fix typo in rails-ujs HTML content testRaymond Zhou2018-04-011-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | `</ps>` is not a valid closing tag for `<p>`.
* | | | | | | Merge pull request #32406 from ↵Kasper Timm Hansen2018-04-014-23/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | olivierlacan/actionview-helpers-docs-consistent-spacing Use consistent spacing in actionview helper docs
| * | | | | | | Use consistent spacing in actionview helper docs [ci skip]Olivier Lacan2018-04-014-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spacing in these comments is fairly inconsistent. Array argument contents are often separated with a space from the array literal brackets but in several cases the Hash literal curly braces are tangent to their contents which makes the documentation harder to read in some cases.
* | | | | | | | Merge pull request #32287 from razh/fix-rails-ujs-html-contentKasper Timm Hansen2018-04-012-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Pass HTML responses as plain-text in rails-ujs
| * | | | | | | Pass HTML responses as plain-text in rails-ujsRaymond Zhou2018-03-192-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running HTML responses through `DOMParser#parseFromString` results in complete `HTMLDocument` instances with unnecessary surrounding tags. For example: new DOMParser().parseFromString('<p>hello</p>', 'text/html') Will output: <html> <head></head> <body> <p>hello</p> </body> </html> This is passed to the `ajax:success` handler as `event.detail[0]` (`data`), but cannot be used directly without first traversing the document. To resolve this, only XML content is passed through `parseFromString`, while HTML content is treated as plain-text. This matches the behavior of jquery-ujs, which relied on jQuery's response-type inference.
* | | | | | | | Merge pull request #32268 from freeletics/encrypted-tmp-file-nameKasper Timm Hansen2018-04-011-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Change temporary file name extension while editing encrypted file.
| * | | | | | | Change temporary file name extension while editing encrypted file.Wojciech Wnętrzak2018-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To have syntax highlighting in an editor try to preserve original extension of edited file.
* | | | | | | | Merge pull request #32400 from ↵Andrew White2018-04-011-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | utilum/cleanup_after_sqlite3_connection_handler_test Remove leftover blank sqlite3 file after in memory handler tests.
| * | | | | | | Remove leftover blank sqlite3 file after in memory handler tests.utilum2018-04-011-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #32398 from ↵Ryuta Kamizono2018-04-018-42/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/32185-dry-in-before-after-mehtods-implementation Move implementation of `before?` and `after?` to `DateAndTime::Calculations`
| * | | | | | | Move implementation of `before?` and `after?` to `DateAndTime::Calculations`bogdanvlviv2018-03-318-42/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents duplication of code. Prevent duplication of tests by moving them to `DateAndTimeBehavior`. Related to #32185.
* | | | | | | | Merge pull request #32396 from eugeneius/database_configurations_urlEileen M. Uchitelle2018-03-312-11/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix two-level database configurations with URLs
| * | | | | | | | Fix two-level database configurations with URLsEugene Kenny2018-03-312-11/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An entry in `ActiveRecord::Base.configurations` can either be a connection spec ("two-level") or a hash of specs ("three-level"). We were detecting two-level configurations by looking for the `database` key, but the database can also be specified as part of the `url` key, which meant we incorrectly treated those configurations as three-level.
* | | | | | | | | Merge pull request #32397 from yhirano55/remove_needless_images_in_guidesXavier Noria2018-03-3141-15/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Remove needless images in guides
| * | | | | | | | Remove needless images in guidesYoshiyuki Hirano2018-03-3128-5/+0
| | | | | | | | |
| * | | | | | | | Put images into each page's dir in guidesYoshiyuki Hirano2018-03-3113-10/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #32394 from yskkin/key_generatorAndrew White2018-03-312-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Deriving `secret_key_base` breaks `key_generator` defined in 5.1.
| * | | | | | | | Deriving `secret_key_base` breaks `key_generator` defined in 5.1.Yoshiyuki Kinjo2018-03-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one created Rails 5.1 app and then updated to 5.2, `secret_key_base` defined in `config/secrets.yml` is ignored for `development` and `test` environment. A change in `secret_key_base` in turn breaks `Rails.application.key_generator`. If one encrypt data in Rails 5.1, she cannot decrypt it in Rails 5.2 for `development` and `test` environment.
* | | | | | | | | Merge pull request #32395 from yhirano55/use_oxford_comma_style_in_guideAndrew White2018-03-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | [ci skip] Use Oxford comma style in guide
| * | | | | | | | [ci skip] Use Oxford comma style in guideYoshiyuki Hirano2018-03-311-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #32386 from utilum/tmpname_basenameAndrew White2018-03-311-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1
| * | | | | | | | Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1utilum2018-03-311-1/+3
|/ / / / / / / /
* / / / / / / / Revert "[ci skip] Capitalize sentence of first char in AS guide"Andrew White2018-03-311-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text is a continuation of the sentence before the listing so doesn't need to begin with a capital letter. This reverts commit 77a7acafba11fccac8b4cf30a9ce62d43a9ac186.
* | | | | | | Merge pull request #32392 from ↵Andrew White2018-03-311-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | yhirano55/capitalize_sentence_of_first_char_in_as_guide [ci skip] Capitalize sentence of first char in AS guide
| * | | | | | [ci skip] Capitalize sentence of first char in AS guideYoshiyuki Hirano2018-03-311-1/+1
| | | | | | |
* | | | | | | Merge pull request #32389 from yhirano55/add_earlier_releases_in_guidesRyuta Kamizono2018-03-311-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add earlier releases v3.0, v3.1 in guides
| * | | | | | | Add earlier releases links v3.0 and v3.1 in guidesYoshiyuki Hirano2018-03-311-1/+3
| | | | | | | |
* | | | | | | | Merge pull request #32388 from yhirano55/remove_useless_stylesheet_file_in_guideRyuta Kamizono2018-03-311-50/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove useless stylesheet file in guide
| * | | | | | | | Remove useless stylesheet file in guideYoshiyuki Hirano2018-03-311-50/+0
| |/ / / / / / /
* | | | | | | | Bump tested versions of Ruby on CIAndrew White2018-03-311-8/+8
| | | | | | | |
* | | | | | | | Merge pull request #32390 from yhirano55/modify_twitter_api_link_in_api_guideRyuta Kamizono2018-03-311-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [ci skip] Modify twitter api link in api guide
| * | | | | | | [ci skip] Modify twitter api link in api guideYoshiyuki Hirano2018-03-311-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | * The twitter developer site's url was changed.
* | | | | | | Merge pull request #32366 from utilum/use_current_configAndrew White2018-03-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use current_config in structure_dump