aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Add helper for testing against a mock WebSocket and serverJavan Makhmali2016-05-315-56/+48
| | | | | |
| * | | | | Reorganize `MockWebSocket`Jon Moss2016-05-312-22/+32
| | | | | |
| * | | | | Add configuration for `WebSocket` and `logger`Jon Moss2016-05-314-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | [Javan Makhmali, Jon Moss]
* | | | | | Respect options passed to `foreign_key` when reverting `add_reference`Sean Griffin2016-05-312-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code incorrectly assumes that the option was written as `foreign_key: true`, but that is not always the case. This now mirrors the behavior of reverting `add_foreign_key`. The code was changed to use kwargs while I was touching it, as well. This could really use a refactoring to go through the same code paths as `add_refernce` in the future, so we don't duplicate default values. Fixes #25169
* | | | | | Merge pull request #25216 from javan/actioncable/tune-sauce-labs-testsJeremy Daer2016-05-313-21/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Action Cable: Tune Sauce Labs tests
| * | | | | | Lock Faye version to avoid bug with its Promise polyfill, use mainline ↵Javan Makhmali2016-05-312-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | blade-sauce_labs_plugin gem
| * | | | | | Test single latest browser versionJavan Makhmali2016-05-311-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Cuts down the number of concurrent Sauce Labs VMs we need to spin up. Can add specific versions back in to target regressions if need be.
* | | | | | Merge pull request #25213 from kamipo/do_not_include_default_column_limitSean Griffin2016-05-313-10/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not include default column limit in schema.rb
| * | | | | | Do not include default column limit in schema.rbRyuta Kamizono2016-05-313-10/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #20815. ```ruby class CreatePeople < ActiveRecord::Migration[5.0] def change create_table :people do |t| t.integer :int t.bigint :bint t.text :txt t.binary :bin end end end ``` Result. In postgresql and sqlite3 adapters: ```ruby ActiveRecord::Schema.define(version: 20160531141018) do create_table "people", force: :cascade do |t| t.integer "int" t.bigint "bint" t.text "txt" t.binary "bin" end end ``` In mysql2 adapter: ```ruby ActiveRecord::Schema.define(version: 20160531141018) do create_table "people", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t| t.integer "int" t.bigint "bint" t.text "txt", limit: 65535 t.binary "bin", limit: 65535 end end ``` After this patch: ```ruby ActiveRecord::Schema.define(version: 20160531141018) do create_table "people", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t| t.integer "int" t.bigint "bint" t.text "txt" t.binary "bin" end end ```
* | | | | | `ActiveRecord::Base#hash` should differ between classesSean Griffin2016-05-312-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, we would get collisions if Active Record objects of different classes with the same ID were used as keys of the same hash. It bothers me slightly that we have to allocate inside of this method, but Ruby doesn't provide any way to hash multiple values without allocation
* | | | | | More Action Pack `abstract_unit` cleanup (#25211)Jon Moss2016-05-314-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove dead classes / dead code - Move class definitions to where they are used, don't define in a shared space
* | | | | | Merge pull request #25207 from rajatbansal93/fix-typosJon Moss2016-05-314-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Typo and Grammar [ci skip]
| * | | | | | fix grammarRajat Bansal2016-05-314-6/+6
| | |_|/ / / | |/| | | |
* | | | | | Ensure hashes can be passed to attributes using `composed_of`Sean Griffin2016-05-314-5/+21
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior was broken by 36e9be85. When the value is assigned directly, either through mass assignment or directly assigning a hash, the hash gets passed through to this writer method directly. While this is intended to handle certain cases, when an explicit converter has been provided, we should continue to use that instead. The positioning of the added guard caused the new behavior to override that case. Fixes #25210
* | | | | Bump jbuilder dependency to version 2.5.0 for compatibility fixesDavid Heinemeier Hansson2016-05-311-1/+1
|/ / / /
* | | | Merge pull request #25206 from maclover7/jm-ap-testsRafael França2016-05-312-18/+18
|\ \ \ \ | | | | | | | | | | Move `Workshop` class definition
| * | | | Move `Workshop` class definitionJon Moss2016-05-302-18/+18
|/ / / / | | | | | | | | | | | | | | | | We should define it only where we need it, not in the global abstract unit :grimacing:
* | | | Merge pull request #25179 from kamipo/reuse_result_of_associated_tableSean Griffin2016-05-301-2/+3
|\ \ \ \ | | | | | | | | | | Reuse a result of `table.associated_table(column)` in `AssociationQueryHandler.value_for`
| * | | | Reuse a result of `table.associated_table(column)` in ↵Ryuta Kamizono2016-05-281-2/+3
| | | | | | | | | | | | | | | | | | | | `AssociationQueryHandler.value_for`
* | | | | Exists shouldn't error when used with `includes`Sean Griffin2016-05-304-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exists?` does some hackery where it assumes that we can join onto anything that we passed to `eager_load` or `includes`, which doesn't work if we are joining onto a polymorphic association. Actually figuring out if we want to include something would require knowledge deep within the join dependency module, which is hard to pull up. The simplest solution is just to pass a flag down that says we're not actually going to try to eager load any of the data. It's not the solution I'd like, but that code really needs to be untangled before we can do much with it. This is another attempt at 6d5b1fd which should address the concerns that led to reverting it in 4ecabed.
* | | | | Merge pull request #25194 from vipulnsward/use-cipherKasper Timm Hansen2016-05-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher
| * | | | | use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher for cipher ↵Vipul A M2016-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation. Based on https://github.com/rails/rails/pull/25192#discussion_r65018222 and http://ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/Cipher/Cipher.html
* | | | | | Ensure that instances of `ActiveModel::Errors` can be marshalledSean Griffin2016-05-302-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use default procs inside of the errors object, which gets included by default when marshaling anything that includes `ActiveModel::Validations`. This means that Active Record objects cannot be marshalled. We strip and apply the default proc ourselves. This will ensure the objects are YAML serializable as well, since YAML falls back to marshal implementations now. This is less important, however, as the errors aren't included when dumping Active Record objects. This commit does not include a changelog entry, as 5.0 is still in RC status at the time of writing, and 5.0.0 will not release with the bug this fixes. Fixes #25165
* | | | | | Merge pull request #25175 from kamipo/fix_migration_class_names_in_testsKasper Timm Hansen2016-05-306-6/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix migration class names in tests
| * | | | | Fix migration class names in testsRyuta Kamizono2016-05-286-6/+6
| | | | | |
* | | | | | Tiny document fixes [ci skip]Robin Dupret2016-05-302-2/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add a missing capital letter and avoid using absolute links to the API because they may refer to out-dated documentation on the Edge site.
* | | | | Merge pull request #22240 from resource11/resource11-patch-1Arthur Nogueira Neves2016-05-291-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Requesting documentation update
| * | | | | Issue 22240: adds link to list of instance methods [ci skip]Kathleen McMahon2016-03-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update associations.rb Update associations.rb updates link to instance methods [ci skip]
* | | | | | Merge pull request #24965 from arthurnn/arthurnn/conn_apiArthur Nogueira Neves2016-05-297-37/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change some establish_connection logic
| * | | | | | Add to_hash to specificationArthur Neves2016-05-254-4/+7
| | | | | | |
| * | | | | | Remove `name` from `establish_connection`Arthur Neves2016-05-247-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of passing a separete name variable, we can make the resolver merge a name on the config, and use that before creating the Specification.
| * | | | | | Move establish_connection to handlerArthur Neves2016-05-243-14/+18
| | | | | | |
* | | | | | | Merge pull request #25184 from ↵David Heinemeier Hansson2016-05-2911-35/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/move-up-framework-initializers Move new default initializers into separate directory
| * | | | | | | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-2811-35/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - These initializers are new defaults for Rails 5 and newly generated apps do not need to change them. - Fixes #25181
* | | | | | | | Merge pull request #25190 from willnet/fix-action-cable-guidesप्रथमेश Sonpatki2016-05-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip]Fix wrong require path raising LoadError
| * | | | | | | | [ci skip]Fix wrong require path raising LoadErrorwillnet2016-05-291-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #25189 from xtian/patch-1प्रथमेश Sonpatki2016-05-291-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ActionController::Parameters: Fix #dig doc code
| * | | | | | | | ActionController::Parameters: Fix #dig doc codeChristian Wesselhoeft2016-05-291-5/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | This example code wasn't getting wrapped in a `<code>` tag due to incorrect indentation.
* | | | | | | | Merge pull request #25188 from y-yagi/rename_enum_prefix_suffixKasper Timm Hansen2016-05-291-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip]
| * | | | | | | rename enum_prefix and enum_suffix options to _prefix and _suffix [ci skip]yuuji.yaginuma2016-05-291-2/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:enum_prefix` and `:enum_suffix` was changed to `:_prefix` and `:_suffix` in #20999.
* | | | | | | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to e45f388.
* | | | | | | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the generated integration tests to assert redirects with an absolute path this redirection check in `assert_redirected_to` against the absolute response location would now pass: https://github.com/rails/rails/blob/af245aaf3a1c447752a1b5895adddc66e5f73c00/actionpack/lib/action_dispatch/testing/assertions/response.rb#L55 Thus we'd break early instead of hitting `assert_operator` and have 2 fewer assertions per `assert_redirected_to` as `assert_operator` is composed of 2 assertions internally: https://github.com/seattlerb/minitest/blob/4e146b1515b19a5c474e39c174b037510f6dbc6e/lib/minitest/assertions.rb#L254-L258 Deduct 2 assertions for 2 redirects taking the expected count down by 4 in total for the two failing tests.
* | | | | | | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove public/ files for API apps
| * | | | | | | Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes #25180
* | | | | | | | Redirects are to urls, not pathsDavid Heinemeier Hansson2016-05-281-3/+3
| | | | | | | |
* | | | | | | | The first comment does not explain anything that the code doesnt and the ↵David Heinemeier Hansson2016-05-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | second is now irrelevant with the dedicated API mode
* | | | | | | | Boil down custom Action Cable configuration to a single blockDavid Heinemeier Hansson2016-05-281-4/+2
|/ / / / / / /
* | | | | | | Merge pull request #25177 from y-yagi/fix_class_nameप्रथमेश Sonpatki2016-05-282-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | fix incorrect class name [ci skip]
| * | | | | | fix incorrect class name [ci skip]yuuji.yaginuma2016-05-282-2/+2
|/ / / / / /
* | | | | | Merge pull request #25176 from kamipo/use_add_index_in_guidesVipul A M2016-05-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use `add_index` instead of `execute` in guides [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:44:25 +0000