aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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`
| * | | | Extract `default_primary_key?` to refactor `column_spec_for_primary_key`Ryuta Kamizono2016-03-115-22/+22
| |/ / /
* | | | Merge pull request #24087 from kamipo/dump_bigint_instead_of_integer_limit_8Rafael França2016-03-114-13/+13
|\ \ \ \ | | | | | | | | | | Dump `bigint` instead of `integer` with `limit: 8` for schema dumper
| * | | | Dump `bigint` instead of `integer` with `limit: 8` for schema dumperRyuta Kamizono2016-03-114-13/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby create_table "big_numbers", force: :cascade do |t| t.integer "bigint_column", limit: 8 end ``` After: ```ruby create_table "big_numbers", force: :cascade do |t| t.bigint "bigint_column" end ```
* | | | Merge pull request #23677 from kamipo/passing_table_name_to_column_initializeRafael França2016-03-119-29/+58
|\ \ \ \ | | | | | | | | | | Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`
| * | | | Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`Ryuta Kamizono2016-03-085-17/+11
| | | | |
| * | | | Initialize `column.table_name` immediately for `column.serial?` correctly ↵Ryuta Kamizono2016-03-088-21/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working Currently the results of `column.serial?` is not correct. For `column.serial?` correctly working, initialize `column.table_name` immediately.
* | | | | Merge pull request #24153 from y-yagi/use_activesupport_reloaderKasper Timm Hansen2016-03-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | use `ActiveSupport::Reloader.to_prepare` instead of deprecated `ActionDispatch::Reloader.to_prepare` [ci skip]
| * | | | use `ActiveSupport::Reloader.to_prepare` instead of deprecated ↵yuuji.yaginuma2016-03-111-1/+1
|/ / / / | | | | | | | | | | | | `ActionDispatch::Reloader.to_prepare` [ci skip]
* | | | Merge pull request #23958 from kamipo/fix_bigserial_appears_with_limit_8Rafael França2016-03-112-2/+6
|\ \ \ \ | | | | | | | | | | Fix bigserial appears with limit 8 for schema dumper
| * | | | Fix bigserial appears with limit 8 for schema dumperRyuta Kamizono2016-03-042-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: ```ruby create_table "postgresql_big_serials", force: :cascade do |t| t.bigserial "seq", limit: 8, null: false end ``` After: ```ruby create_table "postgresql_big_serials", force: :cascade do |t| t.bigserial "seq", null: false end ```
* | | | | Merge pull request #24129 from dharamgollapudi/rename_dependencies_rakeRafael França2016-03-112-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Rename dependencies.rake to cache_digests.rake
| * | | | | Rename dependencies.rake to cache_digests.rakeDharam Gollapudi2016-03-092-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the tasks are related to cache_digests and as they are already namespaced under cache_digests, renaming to cache_digests.rake makes it to know where to find these tasks.
* | | | | | Add missing require to tryRafael Mendonça França2016-03-111-0/+2
| | | | | |
* | | | | | Merge pull request #24145 from bdewater/remove_try_requireRafael França2016-03-111-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused try require in ActiveSupport::TimeZone
| * | | | | | Remove unused try requireBart de Water2016-03-101-1/+0
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 20:13:47 +0000