aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
* | | | | | Remove unfinished command infrastructure.Kasper Timm Hansen2016-03-102-72/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're gonna do this right, it will look mighty different from this anyway. (Looking at you, Rails 5.1). It isn't being used in any code as of now, so yanking is the best option.
* | | | | Fix Gemfile.lockRafael Mendonça França2016-03-101-5/+4
| | | | |
* | | | | Merge pull request #24144 from tjschuck/bcrypt_on_windows_fixedRafael França2016-03-101-7/+1
|\ \ \ \ \ | | | | | | | | | | | | Version 3.1.11 works on Windows again
| * | | | | Version 3.1.11 works on Windows againT.J. Schuck2016-03-101-7/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This undoes https://github.com/rails/rails/commit/7241498e51120b9847a8bc16cf48551db0f3e216 https://github.com/codahale/bcrypt-ruby/issues/128 is fixed and closed.
* | | | | Merge pull request #24140 from gregmolnar/guidesVipul A M2016-03-101-5/+3
|\ \ \ \ \ | | | | | | | | | | | | remove obsolete i18n links from guides [ci skip]
| * | | | | remove obsolete i18n links from guides [ci skip]Greg Molnar2016-03-101-5/+3
|/ / / / /
* | | | | Merge pull request #24137 from sidonath/patch-1Rafael França2016-03-101-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Reorder paragraphs in the Routing API docs
| * | | | | [skip ci] Reorder paragraphsDamir2016-03-101-3/+3
|/ / / / / | | | | | | | | | | The previous order made sense [when `match` was used twice to point to two different actions](https://github.com/rails/rails/commit/7305ef842b675bf965f063de681a96294577fb84). In this case the note was misleading as posting to `/posts/:id` would still route to `show` action.
* | | | | Merge pull request #24134 from kamipo/remove_needless_breakRafael França2016-03-101-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove needless `break;` [ci skip]
| * | | | | Remove needless `break;` [ci skip]Ryuta Kamizono2016-03-101-1/+0
| | | | | |
* | | | | | Merge pull request #24136 from salmanasiddiqui/patch-1प्रथमेश Sonpatki2016-03-101-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed comments of add_foreign_key method
| * | | | | | Fixed comments of add_foreign_key methodSalman Afzal Siddiqui2016-03-101-2/+2
|/ / / / / / | | | | | | | | | | | | The comments of add_foreign_key method was displaying incorrect constraint name.
* | | | | | revises whitespace in the gemspec of AV [ci skip]Xavier Noria2016-03-101-4/+4
| | | | | |
* | | | | | revises the homepage URL in the gemspecs [ci skip]Xavier Noria2016-03-108-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | References https://github.com/rails/homepage/issues/46.
* | | | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-101-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #24128 from y-yagi/add_return_values_to_exampleRafael França2016-03-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | add return values to example [ci skip]
| * | | | | add return values to example [ci skip]yuuji.yaginuma2016-03-101-1/+1
|/ / / / /
* | | | | Revert "Merge pull request #24125 from dharamgollapudi/patch-3"Matthew Draper2016-03-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b3c487515c11c367855eda7742bda4a3d680b740, reversing changes made to 4b43651884309c0f5be4dbdd11ea4d16fb880c30.
* | | | | Merge pull request #24125 from dharamgollapudi/patch-3Rafael França2016-03-091-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Rename dependencies.rake to cache_digests.rake
| * | | | | Rename dependencies.rake to cache_digests.rakeDharam Gollapudi2016-03-091-0/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchersRafael França2016-03-092-14/+15
|\ \ \ \ \ | | | | | | | | | | | | Remove passing `with_dispatchers` to AppGenerator
| * | | | | Remove passing `with_dispatchers` to AppGeneratorPrathamesh Sonpatki2016-03-092-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - While working on https://github.com/rails/rails/pull/22790 I found out that we pass `with_dispatchers: true` but it's not used at all by Rails. - We were passing `with_dispatchers: true` in few tests too but again it's not used by Rails.
* | | | | | Merge pull request #24123 from mperham/masterRafael França2016-03-092-6/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Job payload should be symmetric across JSON dump/load
| * | | | | | Add JSON round trip verification testcaseMike Perham2016-03-092-2/+17
| | | | | | |
| * | | | | | Job payload should be symmetric across JSON dump/loadMike Perham2016-03-092-4/+4
| | | | | | | | | | | | | | | | | | | | | Placing non-native JSON data types, like symbols, in the hash to serialize means that the deserialize method will return something different from what was serialized, a common bug and source of frustration for devs.
* | | | | | | Merge pull request #24121 from y-yagi/use_same_to_type_objectRafael França2016-03-092-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | use same name to type object
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 18:46:49 +0000