aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28029 from koic/empty_insert_statement_value_not_supportedMatthew Draper2017-04-042-0/+4
|\ | | | | Raise NotImplementedError when using empty_insert_statement_value with Oracle
| * Raise NotImplementedError when using empty_insert_statement_value with OracleKoichi ITO2017-02-172-0/+4
| | | | | | | | Refer: https://github.com/rsim/oracle-enhanced/pull/1180
* | Revert "Merge pull request #28598 from wnadeau/patch-1"Rafael Mendonça França2017-04-031-1/+1
| | | | | | | | | | | | | | | | This reverts commit a680a5814184e2f37c4686aa53d0ad3c7fb6b1ee, reversing changes made to 842f67dd242e738419f27e752ea7dcd0bbe87b6d. Reason: I can't resist to the joke, so better to keep it there https://github.com/rails/rails/pull/28598#issuecomment-290945339.
* | Merge pull request #28649 from y-yagi/ruby-241Matthew Draper2017-04-031-1/+1
|\ \ | | | | | | CI against Ruby 2.4.1
| * | CI against Ruby 2.4.1yuuji.yaginuma2017-04-031-1/+1
|/ / | | | | | | Related #28532, #27636
* | Revert "Avoid broken faraday 0.12.0 release"Matthew Draper2017-04-022-2/+0
| | | | | | | | This reverts commit 82a7593e3ac427215a280dae5bd6cd42f9404650.
* | Avoid broken faraday 0.12.0 releaseMatthew Draper2017-04-022-1/+3
| |
* | Merge pull request #28641 from diazruy/anchorsMatthew Draper2017-04-022-0/+7
|\ \ | | | | | | Add anchor links to all headers
| * | Add anchor links to all headersRuy Diaz2017-04-012-0/+7
| | | | | | | | | | | | To allow easy linking at all levels and not just from index
* | | Merge pull request #28642 from ttanimichi/patch-1Matthew Draper2017-04-021-1/+1
|\ \ \ | | | | | | | | No need to check nil
| * | | No need to check nilTsukuru Tanimichi2017-04-021-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby nil.respond_to?(:stringify_keys) # => false ``` ```ruby include ActiveModel::AttributeAssignment Object.new.assign_attributes(nil) # => ArgumentError: When assigning attributes, you must pass a hash as an argument. ```
* | | Merge pull request #28636 from bkeepers/patch-2Matthew Draper2017-04-021-0/+2
|\ \ \ | | | | | | | | Limit stale checks to issues
| * | | Limit stale checks to issuesBrandon Keepers2017-04-011-0/+2
| |/ /
* | | Remove CHANGELOG.md entry that appears in 5-1-stableJon Moss2017-04-011-9/+0
| | | | | | | | | | | | | | | | | | | | | This CHANGELOG.md is a continuation of the 5-1-stable one, there shouldn't be any duplicate entries. [ci skip]
* | | Merge pull request #28629 from rossta/patch-4Jon Moss2017-04-011-2/+14
|\ \ \ | |/ / |/| | Add default_scope note to ActiveRecord guide
| * | Add default_scope note to AR guide [ci skip]Ross Kaffenberger2017-03-311-2/+14
|/ / | | | | | | | | | | | | Adds note to explain unexpected behavior described in issue #28561. Developers may be surprised that the internal representation of similar query conditions in Hash and Array formats in default_scope will yield different results for model initialization. Link: https://github.com/rails/rails/issues/28561
* | Correct typo in component nameAndrew White2017-03-311-1/+1
| |
* | Merge pull request #28621 from koic/fix_failed_test_when_running_with_oracleEileen M. Uchitelle2017-03-311-0/+2
|\ \ | | | | | | Fix a failed AR test when running with OracleAdapter
| * | Fix a failed AR test when running with OracleAdapterKoichi ITO2017-03-311-0/+2
| | |
* | | Merge pull request #28612 from tricknotes/ruby-2.3.4Andrew White2017-03-311-3/+3
|\ \ \ | | | | | | | | CI against Ruby 2.3.4
| * | | CI against Ruby 2.3.4Ryunosuke Sato2017-03-311-3/+3
| |/ / | | | | | | | | | https://www.ruby-lang.org/en/news/2017/03/30/ruby-2-3-4-released/
* | | Merge pull request #28620 from ↵Kasper Timm Hansen2017-03-311-1/+1
|\ \ \ | |/ / |/| | | | | | | | y-yagi/add_missing_backtick_to_deprecation_message Add missing backtick to deprecation message
| * | Add missing backtick to deprecation messageyuuji.yaginuma2017-03-311-1/+1
|/ /
* | Merge pull request #28616 from spdawson/patch-4Jon Moss2017-03-301-1/+1
|\ \ | | | | | | Fix example usage of ActiveRecord::Base.establish_connection [ci skip]
| * | Fix example usage of ActiveRecord::Base.establish_connectionSimon Dawson2017-03-301-1/+1
| | | | | | | | | `ActiveRecord::Base.establish_connection` accepts a single symbol argument to specify a named connection; a single string argument appears to be interpreted as a connection URI
* | | Small grammar fixJon Moss2017-03-301-1/+1
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #28617 from javan/rails-ujs/fix-npm-packageRafael França2017-03-3014-105/+146
|\ \ \ | | | | | | | | Restore rails-ujs.js UMD module support
| * | | Reorganize rails-ujs filesJavan Makhmali2017-03-3013-104/+104
| | | |
| * | | Restore rails-ujs.js UMD module supportJavan Makhmali2017-03-301-1/+42
| |/ /
* | | Merge pull request #28607 from mikeastock/move-hash-with-indifferent-access-testRafael França2017-03-302-712/+734
|\ \ \ | |/ / |/| | Move HashWithIndifferentAccess tests to separate file
| * | Move HashWithIndifferentAccess tests to separate fileMichael Stock2017-03-302-712/+734
| | |
* | | Merge pull request #28606 from maclover7/jm-fix-25820Andrew White2017-03-304-1/+64
|\ \ \ | | | | | | | | Do not include default response headers for AC::Metal
| * | | Do not include default response headers for AC::MetalJon Moss2017-03-294-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 4.2, `ActionController::Metal` controllers did not include the default headers from `ActionDispatch::Response`. However, through e16afe6, and a general shift towards having `ActionController::Metal` objects contain `ActionDispatch::Response` objects (instead of just returning an array of status, headers, and body), this behavior was lost. This PR helps to restore the original behavior by having `ActionController::Metal` controllers generate Response objects without the default headers, while `ActionController::Base` now overrides the factory method to make sure its version does have the default headers.
* | | | Merge pull request #28609 from rossta/patch-2Andrew White2017-03-301-1/+1
|\ \ \ \ | | | | | | | | | | Update comment in sanitizer helper test [skip ci]
| * | | | Update comment in sanitizer helper test [skip ci]Ross Kaffenberger2017-03-291-1/+1
| | |/ / | |/| | | | | | The previously referenced file no longer appears to exist in the project.
* | | | Merge pull request #28417 from schneems/schneems/symlink-failuresAndrew White2017-03-302-1/+28
|\ \ \ \ | |/ / / |/| | | Raise when using a bad symlink
| * | | Raise when using a bad symlinkschneems2017-03-142-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a case where a dev made a symlink that worked on some machines and not on others. The issue manifested itself on a machine with `RAILS_ENV=staging` as the had their `config/environments/staging.rb` symlinked to another config file. The behavior was very hard to track down. Current behavior: If you use a bad symlink in a file, you get no warnings or failures or anything. If you have a bad symlink it just ignores the file as if it didn't exist (`File.exist?` returns false for a bad symlink). Patch behavior: With this patch when a file is not present we check if a symlink exists. If it does, that indicates there is a bad symlink and we should raise ``` File "config/environments/staging.rb" is a symlink that does not point to a valid file ```
* | | | Merge pull request #28603 from mikeastock/alias-reverse-mergeSean Griffin2017-03-295-0/+47
|\ \ \ \ | |_|/ / |/| | | Add an alias for reverse_merge to with_defaults
| * | | Add aliases for reverse_merge to with_defaultsMatt Casper2017-03-295-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | In the context of controller parameters, reverse_merge is commonly used to provide defaults for user input. Having an alias to reverse_merge called with_defaults feels more idiomatic for Rails.
* | | | Small grammar fixJon Moss2017-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add comma and change verb. [ci skip]
* | | | Merge pull request #28595 from 3wille/fw-after-action-hintRafael França2017-03-291-1/+1
|\ \ \ \ | | | | | | | | | | add hint on after_action filters
| * | | | add hint on after_action filtersFrederik Wille2017-03-291-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a hint that ``after_action``-callbacks are not executed when an exception was raised in the rest of the request cycle. The ``before_action`` section mentions "If there are additional filters scheduled to run after that filter, they are also cancelled." but this is IMO not sufficient.
* | | | Merge pull request #28592 from ↵Rafael França2017-03-293-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | htanata/ar_relation_inspect_should_not_load_all_records Load only needed records on ActiveRecord::Relation#inspect
| * | | | Load only needed records on ActiveRecord::Relation#inspectHendy Tanata2017-03-283-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of loading all records and returning only a subset of those, just load the records as needed. Fixes #25537.
* | | | | Merge pull request #28602 from tricknotes/fix-rails-groups-exampleRafael França2017-03-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix the example code for `Rails.groups` [ci skip]
| * | | | | Fix the example code for `Rails.groups` [ci skip]Ryunosuke Sato2017-03-301-2/+2
| | |/ / / | |/| | | | | | | | | | | | | `Rails.groups` contains `Rails.env` that is inspected as String.
* | | | | Merge pull request #28600 from tricknotes/ruby-2.2.7Rafael França2017-03-291-2/+2
|\ \ \ \ \ | | | | | | | | | | | | CI against Ruby 2.2.7
| * | | | | CI against Ruby 2.2.7Ryunosuke Sato2017-03-301-2/+2
| |/ / / / | | | | | | | | | | | | | | | https://www.ruby-lang.org/en/news/2017/03/28/ruby-2-2-7-released/
* | | | | Add test to make sure subclasses also get helpersRafael Mendonça França2017-03-291-0/+16
| | | | |
* | | | | Merge pull request #28598 from wnadeau/patch-1Rafael França2017-03-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | FinderMethods#fourty_two docs cite proper source
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 17:31:44 +0000