aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24205 from delftswa2016/improve-activesupport-dependenciesXavier Noria2016-03-161-3/+6
|\ | | | | Improve ActiveSupport::Dependencies code understanding
| * Improve code readability in ActiveSupport::DependenciesAaron Ang2016-03-161-5/+6
| |
| * Add comments to ActiveSupport::Dependencies to help understandingAaron Ang2016-03-161-0/+2
| | | | | | | | | | | | | | | | In a previous patch, all log-related stuff was removed. However, some logs are still useful to understand the code. Therefore, in this patch, I put those log messages back as comments. [ci skip]
* | adds .gitattributes to enable Ruby-awarenessXavier Noria2016-03-161-0/+2
|/ | | | | | | | | | | | | | This configuration improves git diff, git log -p -W, git grep -p, ..., and allows to inspect the history of a method with a command like git log -L:new_constants_in:activesupport/lib/active_support/dependencies.rb Let me also appeal to authority by saying it is present in the Ruby repository as well https://github.com/ruby/ruby/blob/trunk/.gitattributes :)
* no need to clear an unusued collectionXavier Noria2016-03-161-1/+1
| | | | | | | | | | If the code reaches that line new_constants is no longer needed. We only need here to iterate over it to discard stuff and done. Note that constant_watch_stack.new_constants returns a new reference each time it is invoked, so that #clear call was not cleaning state in some internal structure (which would have been a bit dirty as well at this level of coupling).
* removes unreachable codeXavier Noria2016-03-161-2/+0
| | | | | | | | | | | | This array literal cannot be reached. The previous begin either returns to the caller via the explicit return in the ensure block if all goes well, or else propagates whatever make the begin block abort execution. I have investigated the origin of this a bit. In the past the ensure block didn't have a return call, see for example c08547d. Later on the return was added in 4da4506, but the trailing literal was left there.
* tests the raising/throwing discards the watching stackXavier Noria2016-03-163-4/+8
|
* s/removes/discards/Xavier Noria2016-03-161-2/+2
|
* adds coverage for raising while autoloadingXavier Noria2016-03-162-0/+12
|
* adds coverage for throwing while autoloadingXavier Noria2016-03-152-0/+14
| | | | References #24205.
* Share dev caching implementation between task and server.Kasper Timm Hansen2016-03-153-25/+46
| | | | | Lets have the server and the Rake task go through the same ropes, so we can share all the file lookup, adding, and deleting code.
* Merge pull request #24204 from sand33pn/masterVipul A M2016-03-151-1/+1
|\ | | | | Update action_controller_overview.md
| * Update action_controller_overview.mdSandeep Navghane2016-03-151-1/+1
|/
* Merge pull request #24198 from delftswa2016/remove-log-related-stuffXavier Noria2016-03-153-51/+0
|\ | | | | Remove log-related stuff from ActiveSupport::Dependencies
| * Remove log-related stuff from ActiveSupport::DependenciesAaron Ang2016-03-153-51/+0
|/ | | | | In this patch, all log-related stuff in `ActiveSupport::Dependencies` is removed because the logging is no longer useful.
* Merge pull request #24188 from wiehann/railsguide-fixJon Moss2016-03-141-1/+1
|\ | | | | Correct command for generating secret_key_base [ci skip]
| * Correct command for generating secret_key_base [ci skip]Wiehann2016-03-141-1/+1
| |
* | Merge pull request #24187 from akihiro17/fix-find-docArthur Nogueira Neves2016-03-141-2/+2
|\ \ | |/ |/| [ci skip] Fix the FinderMethods#find document
| * [ci skip] Fix the FinderMethods#find documentakihiro172016-03-141-2/+2
|/ | | | We should use #find_or_initialize_by and #find_or_create_by because #first_or_initialize and #first_or_create methods are not the public API
* Merge pull request #24184 from y-yagi/add_queue_classic_to_listप्रथमेश Sonpatki2016-03-141-3/+4
|\ | | | | add `queue_classic` to list of provide `provider_job_id` [ci skip]
| * add `queue_classic` to list of provide `provider_job_id` [ci skip]yuuji.yaginuma2016-03-141-3/+4
|/
* Merge pull request #24175 from y-yagi/add_headers_to_payloadJon Moss2016-03-121-0/+4
|\ | | | | add headers to payload list [ci skip]
| * add headers to payload list [ci skip]yuuji.yaginuma2016-03-131-0/+4
| | | | | | | | Follow up to #24115.
* | Merge pull request #24174 from y-yagi/silence_deprecation_messageArthur Nogueira Neves2016-03-121-1/+3
|\ \ | | | | | | silence deprecation message for dynamic controller and actions on Action View test
| * | silence deprecation message for dynamic controller and actions on Action ↵yuuji.yaginuma2016-03-131-1/+3
| |/ | | | | | | | | | | View test Follow up to #23980.
* | Merge pull request #24171 from bdewater/strong_parameters_anaf_docAndrew White2016-03-121-2/+3
|\ \ | | | | | | Add explanation about accepts_nested_attributes_for keys in the strong parameters docs
| * | Add explanation about accepts_nested_attributes_for keys in the strong ↵Bart de Water2016-03-121-2/+3
| |/ | | | | | | parameters documentation [skip ci]
* | Merge pull request #24166 from kamipo/fix_warning_method_redefinedAndrew White2016-03-121-3/+0
|\ \ | |/ |/| Fix `warning: method redefined; discarding old female`
| * Fix `warning: method redefined; discarding old female`Ryuta Kamizono2016-03-121-3/+0
|/ | | | | | | | | | | ``` $ ARCONN=mysql2 be ruby -w -Itest test/cases/scoping/default_scoping_test.rb Using mysql2 /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/scoping/named.rb:158: warning: method redefined; discarding old female /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/scoping/named.rb:158: warning: previous definition of female was here /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/scoping/named.rb:158: warning: method redefined; discarding old male /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/scoping/named.rb:158: warning: previous definition of male was here ```
* Merge pull request #24163 from prathamesh-sonpatki/fix-gemfile-lockRafael França2016-03-121-1/+1
|\ | | | | Fix Gemfile.lock
| * Fix Gemfile.lockPrathamesh Sonpatki2016-03-121-1/+1
|/ | | | | - Resque version was locked to < 1.26 in 92f869a0c85268 but Gemfile.lock was not updated.
* Merge pull request #24161 from Sen-Zhang/restore_application_mailerRafael França2016-03-113-0/+16
|\ | | | | regenerate application_mailer.rb if it is missing
| * improve some codeSen-Zhang2016-03-111-2/+4
| |
| * generate application_mailer.rb if it is missingSen-Zhang2016-03-113-0/+14
|/
* AC: skip PG adapter tests if the db isn't availableJeremy Daer2016-03-111-0/+7
|
* Merge pull request #23797 from ↵Rafael França2016-03-113-3/+13
|\ | | | | | | | | kamipo/case_sensitive_comparison_for_non_string_column The BINARY Operator is only needed for string columns
| * The BINARY Operator is only needed for string columnsRyuta Kamizono2016-02-223-3/+13
| | | | | | | | Follow up to #13040.
* | Break up a circular require between AP/AVSean Griffin2016-03-114-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now referencing the constant `AbstractController::Rendering` causes `ActionView::Base` to be loaded, and thus the load hooks for action_view are run. If that load hook references any part of action view that then references action controller (such as `ActionView::TestCase`), the constant `AbstractController::Rendering` will attempt to be autoloaded and blow up. With this change, `ActionView::LoadPaths` no longer requires `ActionView::Base` (which it had no reason to require). There was a needed class from `AbstractController::Base` in the Rendering module, which I've moved into its own file so we don't need to load all of `AbstractController::Base` there. This commit fixes https://github.com/rails/rails-controller-testing/issues/21
* | Merge pull request #24155 from chrisarcand/clarify-has-many-dependent-optionJon Moss2016-03-111-9/+7
|\ \ | | | | | | Clarify has_many :dependent option docs [ci skip]
| * | Clarify has_many :dependent option docs [ci skip]Chris Arcand2016-03-111-9/+7
| | | | | | | | | | | | | | | | | | Clarifies the documentation here to mean all options are for when the relation is destroyed; also now reflects the documentation on this same option found in the has_one section.
* | | Ping the resque version while we can't investigate the failureRafael Mendonça França2016-03-111-1/+1
| | |
* | | Use the most highest priority exception handler when cause is setSean Griffin2016-03-113-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some subtle breakage caused by #18774, when we removed `#original_exception` in favor of `#cause`. However, `#cause` is automatically set by Ruby when raising an exception from a rescue block. With this change, we will use whichever handler has the highest priority (whichever call to `rescue_from` came last). In cases where the outer has lower precidence than the cause, but the outer is what should be handled, cause will need to be explicitly unset. Fixes #23925
* | | Fix test failures caused by #23958Sean Griffin2016-03-111-1/+1
| | | | | | | | | | | | I'm unsure how this passed CI in the pull request.
* | | Merge pull request #22854 from jcoyne/missing_templateSean Griffin2016-03-113-1/+23
|\ \ \ | | | | | | | | | | | | Default rendering behavior if respond_to collector doesn't have a block.
| * | | Render default template if block doesn't renderJustin Coyne2016-02-253-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `respond_to` collector doesn't have a response, then a `:no_content` response should be rendered. This brings the default rendering behavior introduced by https://github.com/rails/rails/issues/19036 to controller methods employing `respond_to`
* | | | Merge pull request #24150 from exviva/unmarshal-infinite-retryXavier Noria2016-03-113-1/+20
|\ \ \ \ | | | | | | | | | | Prevent `Marshal.load` from looping infinitely
| * | | | Prevent `Marshal.load` from looping infinitelyOlek Janiszewski2016-03-113-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in `Marshal.load` that caused it to loop indefinitely when trying to autoload a constant that resolved to a different name. This could occur when marshalling an ActiveRecord 4.0 object (e.g. into memcached) and then trying to unmarshal it with Rails 4.2. The marshalled payload contains a reference to `ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column`, which in Rails 4.2 resolves to `ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::Column`.
* | | | | Merge pull request #24143 from perceptec/fix-thread-mattr-accessor-refsMatthew Draper2016-03-122-2/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix `thread_mattr_accessor` thread-local variable naming
| * | | | Fix `thread_mattr_accessor` thread-local variable namingMichael Ryan2016-03-112-2/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implentation of `thread_mattr_accessor` is setting differently-named thread variables when defining class and instance writer methods, so the method isn't working as documented: Account.user = "DHH" Account.user # => "DHH" Account.new.user # => nil a = Account.new a.user = "ABC" # => "ABC" a.class.user # => "DHH" At this point `:attr_Account_user` and `:attr_Class_user` thread-local variables have been created. Modify the reader and writer methods to use the class name instead of 'Class'.
* | | | Merge pull request #24054 from kamipo/extract_default_primary_keyRafael França2016-03-115-22/+22
|\ \ \ \ | | | | | | | | | | Extract `default_primary_key?` to refactor `column_spec_for_primary_key`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:46:02 +0000