aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #23759 from maclover7/fix-23757Kasper Timm Hansen2016-08-212-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent invocation of channel action if rejected connection
| * | | | | | | Prevent invocation of channel action if rejected connectionJon Moss2016-08-192-1/+16
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23757. Before this commit, even if `reject` was called in the `subscribe` method for an Action Cable channel, all actions on that channel could still be invoked. This calls a `return` if a rejected connection tries to invoke any actions on the channel.
* | | | | | | Merge pull request #26234 from y-yagi/remove_unnessary_session_store_settingKasper Timm Hansen2016-08-211-1/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | remove unnessary `session_store` setting
| * | | | | | remove unnessary `session_store` settingyuuji.yaginuma2016-08-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since e5a6f7ee9e951dbe0e4e9ea2c0743b4dfb135c57, by default the session store will be set to cookie store with application name as session key.
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-08-215-8/+8
|\ \ \ \ \ \ \
| * | | | | | | When referring to Rails, be consistent in usage of capitalized form, unless ↵Vipul A M2016-08-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is used in context of a command like bin/rails or the rails directory [ci skip]
| * | | | | | | Grammar changes on getting started guide, specify where exactly the example ↵Vipul A M2016-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is that we are referring to. [ci skip]
| * | | | | | | Fix remaining broadcasting_name example from Action Cable guide [ci skip]Prathamesh Sonpatki2016-08-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/26125.
* | | | | | | | Merge pull request #26227 from alexcameron89/syntax_highlighter_fixVijay Dev2016-08-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Increase margin-bottom for doc's code syntax highlighter
| * | | | | | | Increase margin-bottom for doc's code syntax highlighterAlex Kitchens2016-08-201-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #25744 by slightly increasing the margin in code syntax highlights. With a margin of 0, it was cutting off underscores in Linux browesers, so I slightly increased it to 0.5px.
* | | | | | | Merge pull request #26232 from kamipo/fix_oid_bit_cast_valueSean Griffin2016-08-202-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `OID::Bit#cast_value`
| * | | | | | | Fix `OID::Bit#cast_value`Ryuta Kamizono2016-08-202-4/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #26137.
* | | | | | | Merge pull request #26233 from y-yagi/update_retry_on_exampleप्रथमेश Sonpatki2016-08-201-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | correct exception class in `retry_on` example [ci skip]
| * | | | | | correct exception class in `retry_on` example [ci skip]yuuji.yaginuma2016-08-201-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | If the deadlock has occurred `ActiveRecord::Deadlocked` will raise. Ref: #25107, #26059
* | | | | | Merge pull request #26224 from jonatack/consistent-asset-precompile-examplesEileen M. Uchitelle2016-08-195-10/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Consistent examples and template for assets#precompile
| * | | | | Consistent examples and template for assets#precompileJon Atack2016-08-195-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Listening to a few developers today discussing their troubles in understanding how to use the asset pipeline, it turns out that the precompile examples in the guides and assets.rb template have over time become a bit inconsistent. This PR makes the examples consistent in code style, spacing, and asset names, removes the old 'swfObject.js' example, and in a couple of places wraps lines at 80 characters including in the assets.rb template. Re-add spaces inside array parentheses.
* | | | | | Merge pull request #26219 from kamipo/remove_unused_blob_or_text_columnRafael França2016-08-192-9/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused `blob_or_text_column?` method
| * | | | | | Remove unused `blob_or_text_column?` methodRyuta Kamizono2016-08-192-9/+0
| | | | | | |
* | | | | | | Merge pull request #26218 from kamipo/remove_unnecessary_lengthRafael França2016-08-192-12/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Remove unnecessary `length` method for collection proxy
| * | | | | | Remove unnecessary `length` method for collection proxyRyuta Kamizono2016-08-192-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `length` is delegated to `records` (`load_target`) by `ActiveRecord::Delegation`. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/relation/delegation.rb#L38
* | | | | | | Copy edits in the documentation [ci skip]Rafael Mendonça França2016-08-192-4/+6
| | | | | | |
* | | | | | | Merge pull request #26212 from ↵Rafael França2016-08-193-1/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | evmunro/as-json-sets-request-to-json-for-controller-test Allow setting of request CONTENT-TYPE with as: in controller tests
| * | | | | | | Set the request type if as: is specifiedEverest Munro-Zeisberger2016-08-183-1/+22
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Documentation & testing
* | | | | | | Merge pull request #25675 from TimPetricola/schema-no-standardized-column-widthsRafael Mendonça França2016-08-194-11/+125
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Option not to line up column attributes in schema.rb
| * | | | | | | Merge branch 'master' into schema-no-standardized-column-widthsTim Petricola2016-08-184-117/+137
| |\| | | | | |
| * | | | | | | Option not to line up column types and attributes in schema.rbTim Petricola2016-08-174-14/+128
| | | | | | | |
* | | | | | | | Add chengelog entry to #25976Rafael Mendonça França2016-08-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rafael Mendonça França + Robin Dupret]
* | | | | | | | Merge pull request #26154 from ↵Rafael Mendonça França2016-08-196-84/+70
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_text_default_treated_as_empty_string Remove text default treated as an empty string in non-strict mode
| * | | | | | | Remove text default treated as an empty string in non-strict modeRyuta Kamizono2016-08-196-84/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strict mode controls how MySQL handles invalid or missing values in data-change statements such as INSERT or UPDATE. If strict mode is not in effect, MySQL inserts adjusted values for invalid or missing values and produces warnings. ```ruby def test_mysql_not_null_defaults_non_strict using_strict(false) do with_mysql_not_null_table do |klass| record = klass.new assert_nil record.non_null_integer assert_nil record.non_null_string assert_nil record.non_null_text assert_nil record.non_null_blob record.save! record.reload assert_equal 0, record.non_null_integer assert_equal "", record.non_null_string assert_equal "", record.non_null_text assert_equal "", record.non_null_blob end end end ``` It is inconsistent with other types that only text/blob defaults treated as an empty string. This commit fixes the inconsistency.
* | | | | | | | Merge pull request #26217 from kamipo/revert_23067Rafael França2016-08-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Revert "`sql_for_insert` returns values for passing to `exec_insert`"
| * | | | | | | | Revert "`sql_for_insert` returns values for passing to `exec_insert`"Ryuta Kamizono2016-08-191-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts #23067. #23067 is for propagating `pk` value from `sql_for_insert` to `exec_insert` (avoiding extra query for pg adapter). Now `exec_insert` includes `sql_for_insert` since #26002 therefore this propagating is no longer needed.
* | | | | | | | Merge pull request #25989 from ↵Rafael França2016-08-192-11/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_select_for_collection_proxy Remove unnecessary `select` method for `CollectionProxy`
| * | | | | | | | Remove unnecessary `select` method for `CollectionProxy`Ryuta Kamizono2016-08-182-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `CollectionProxy` inherits `Relation` and `Relation` includes `QueryMethods`. This method is completely duplicated. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/relation/query_methods.rb#L271-L275
* | | | | | | | | Merge pull request #26216 from y-yagi/fixes_19880Rafael França2016-08-193-2/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | run `before_configuration` callbacks as soon as application constant inherits from Rails::Application
| * | | | | | | | | run `before_configuration` callbacks as soon as application constant ↵yuuji.yaginuma2016-08-193-2/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inherits from Rails::Application Until Rails 4.1, `before_configuration` run as soon as the application constant inherits from `Rails::Application`. However, in d25fe31c40928712b5e08fe0afb567c3bc88eddf, it has been modified to run at instantiation process. This modify to `before_configuration` is run at same timing as to Rails 4.1. Fixes #19880
* | | | | | | | | Merge pull request #26089 from travisoneill/sqlite_rollback_fixRafael Mendonça França2016-08-194-5/+31
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | Sqlite3 Migration Error Fixed (issue #26087)
| * | | | | | | | Added nil case handling to allow rollback migration in case oftravis.h.oneill@gmail.com2016-08-174-5/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid column type /activerecord/lib/active_record/connection_adapters /abstract/schema_definitions.rb:306 type = type.to_sym Changed to the following to handle nil case: type = type.to_sym if type Added regression test for this case: /activerecord/test/cases/migration_test.rb:554 if current_adapter?(:SQLite3Adapter) def test_allows_sqlite3_rollback_on_invalid_column_type Person.connection.create_table :something, force: true do |t| t.column :number, :integer t.column :name, :string t.column :foo, :bar end assert Person.connection.column_exists?(:something, :foo) assert_nothing_raised { Person.connection.remove_column :something, :foo, :bar } assert !Person.connection.column_exists?(:something, :foo) assert Person.connection.column_exists?(:something, :name) assert Person.connection.column_exists?(:something, :number) ensure Person.connection.drop_table :something, if_exists: true end end
* | | | | | | | Merge pull request #24099 from k0kubun/preserve-readonlyRafael Mendonça França2016-08-185-4/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve readonly flag only for readonly association
| * | | | | | | | Preserve readonly flag only for readonly associationTakashi Kokubun2016-07-305-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24093
* | | | | | | | | Merge pull request #26200 from kamipo/remove_unnecessary_ordinal_methodsRafael França2016-08-183-93/+84
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unnecessary ordinal methods for collection association
| * | | | | | | | | Remove unnecessary ordinal methods for collection associationRyuta Kamizono2016-08-183-93/+84
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `CollectionProxy` inherits `Relation` therefore we can use its own methods rather than delegating to collection association.
* | | | | | | | | Merge pull request #25999 from kamipo/remove_sanitize_conditionsRafael França2016-08-183-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove `sanitize_conditions` and use `sanitize_sql` instead of `sanitize_conditions`
| * | | | | | | | | Deprecate `sanitize_conditions`. Use `sanitize_sql` insteadRyuta Kamizono2016-08-183-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `sanitize_conditions` protected method is only used in one place.
* | | | | | | | | | Merge pull request #26197 from ↵Rafael França2016-08-182-9/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_unnecessary_test_sql_for_insert_with_returning_disabled Remove unnecessary `test_sql_for_insert_with_returning_disabled`
| * | | | | | | | | | Remove unnecessary `test_sql_for_insert_with_returning_disabled`Ryuta Kamizono2016-08-182-9/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `sql_for_insert` is only called in `use_insert_returning?` is true since #26002.
* | | | | | | | | | Merge pull request #26214 from philnash/active-job-default-queueClaudio B2016-08-181-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Updates Active Job guide on default runner.
| * | | | | | | | | [ci skip] Updates ActiveJob guide on default runner.Phil Nash2016-08-181-3/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | The immediate runner is no longer default, the async adapter is.
* | | | | | | | | Merge pull request #26193 from iancanderson/ia-document-i18n-required-messageJon Moss2016-08-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | i18n documentation for required belongs_to message
| * | | | | | | | i18n documentation for required belongs_to messageIan C. Anderson2016-08-171-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you don't explicitly provide `optional: true` to a `belongs_to` definition, rails adds a validation to ensure presence of the `belongs_to` validation. However, when the validation is added, it is added with a message key of `:required`, which was not documented in the "Translations for Active Record Models" section of the i18n guides. Here are the lines that add the `:required` message: https://github.com/rails/rails/blob/c3e3577f9d5058382504773bf0d32afa15cb131e/activerecord/lib/active_record/associations/builder/belongs_to.rb#L136-L138 This commit adds the "non-optional association" validation to the table, so rails users know how to override the message for this validation. The default message is "must exist".
* | | | | | | | Change method visibility to be privateRafael Mendonça França2016-08-171-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those methods are only using inside this module and by a private method so they all should be private.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 04:00:50 +0000