aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-0118-17/+51
|
* Merge pull request #23369 from maclover7/actioncable-assets-reduxMatthew Draper2016-02-0111-7/+49
|\ | | | | | | Action Cable Assets Compilation redux
| * Add Action Cable asset building as release stepJon Moss2016-01-301-0/+1
| |
| * Improvements and reorganization of assetsJon Moss2016-01-3010-3/+10
| |
| * Add task to create precompiled action_cable.js and reorganize to accommodateJavan Makhmali2016-01-3010-7/+41
| |
* | Merge pull request #23368 from ↵Santiago Pastorino2016-01-311-3/+0
|\ \ | | | | | | | | | | | | y-yagi/remove_backward_compatibility_code_for_minitest_4 remove backward compatibility code for Minitest 4
| * | remove backward compatibility code for Minitest 4yuuji.yaginuma2016-01-301-3/+0
| | | | | | | | | | | | | | | The master branch is required Ruby 2.2.2+, for the Ruby 2.2 is bundled Minitest 5.4.3, I think backward compatibility code for Minitest 4 is unnecessary.
* | | Wait for EventMachine to finish startingMatthew Draper2016-02-011-0/+1
| | |
* | | Merge pull request #23371 from kamipo/remove_odd_backtickVipul A M2016-01-311-1/+1
|\ \ \ | |_|/ |/| | Remove odd ` [ci skip]
| * | Remove odd ` [ci skip]Ryuta Kamizono2016-01-311-1/+1
|/ /
* | Merge pull request #23366 from maclover7/add-configuation-ar-docsJon Moss2016-01-301-0/+102
|\ \ | | | | | | Add configuration section to "Active Record Basics" guide
| * | Add configuration section to "Active Record Basics" guideJon Moss2016-01-301-0/+102
|/ / | | | | | | | | | | | | | | | | | | | | | | This is to fill in some missing information as apart of #22931. It's on purpose that the sample `Message` model inherits from `ActiveRecord::Base` -- Active Record is not meant to be coupled to Rails, and we can't guarantee that users outside of the Rails world will have an `ApplicationRecord` class that inherits from `ActiveRecord::Base`. [ci skip]
* | Merge pull request #23364 from maclover7/fix-23358Jon Moss2016-01-301-1/+1
|\ \ | | | | | | Small cleanup to Testing Guide
| * | Small cleanup to Testing GuideJon Moss2016-01-301-1/+1
|/ / | | | | | | | | | | | | - inbuilt --> built-in - Remove random spaces from code examples [ci skip]
* | Merge pull request #23358 from vipulnsward/testing-guide-pass-3Vipul A M2016-01-311-19/+28
|\ \ | | | | | | Pass 3 over testing guide
| * | Pass 3 over testing guideVipul A M2016-01-311-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Various grammar fixes - Added assertions for update controller action tests - Added user helper tests - Fix typos [ci skip]
* | | Merge pull request #23363 from pra85/patch-1Vipul A M2016-01-311-1/+1
|\ \ \ | | | | | | | | typo fix [ci skip]
| * | | typo fix [ci skip] Prayag Verma2016-01-311-1/+1
|/ / / | | | | | | Spelling mistake - direcotry > directory
* | | Merge pull request #23362 from vipulnsward/20821-save-doc-updateJon Moss2016-01-301-3/+3
|\ \ \ | | | | | | | | - Updated persistence documentation to make it clear that save and sa…
| * | | - Updated persistence documentation to make it clear that save and save! ↵Vipul A M2016-01-311-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won't update a record if validation fails. - Also fixed `update` method's documention to be uniform about this statement. Fixes #20821 [ci skip] [Vipul A M & pseidemann ]
* | | Revert "Merge pull request #23346 from kamipo/refactor_oid_money_precision"Rafael Mendonça França2016-01-302-5/+9
| | | | | | | | | | | | | | | | | | | | | This reverts commit ff835f90800a3e4122d64606cb328908c2e0e071, reversing changes made to c4d85dfbc71043e2a746acd310e32f4f04db801a. Reason: This broke the tests. We will add back after investigated.
* | | Merge pull request #23345 from ↵Rafael França2016-01-302-0/+13
|\ \ \ | | | | | | | | | | | | | | | | yui-knk/warning_when_composite_primary_key_is_detected Warn if `AR.primary_key` is called for a table who has composite prim…
| * | | Warn if `AR.primary_key` is called for a table who has composite primary keyyui-knk2016-01-302-0/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | If `AR.primary_key` is called for a table who has composite primary key, the method returns `nil`. This behavior sometimes generates invalid SQL. The first time developers notice to invalid SQL is when they execute SQL. This commit enables developers to know they are doing something dangerous as soon as possible.
* | | Merge pull request #23349 from kamipo/refactor_column_existsRafael França2016-01-301-7/+8
|\ \ \ | | | | | | | | Refactor `column_exists?` in `SchemaStatements`
| * | | Refactor `column_exists?` in `SchemaStatements`Ryuta Kamizono2016-01-301-7/+8
| |/ /
* | | Merge pull request #23355 from kamipo/fix_bigint_for_enum_columnsRafael França2016-01-303-2/+7
|\ \ \ | | | | | | | | Fix `bigint?` for Enum columns in MySQL
| * | | Fix `bigint?` for Enum columns in MySQLRyuta Kamizono2016-01-313-2/+7
| | | | | | | | | | | | | | | | Follow up to #22896.
* | | | Merge pull request #23350 from kamipo/refactor_schema_migration_drop_tableRafael França2016-01-301-4/+1
|\ \ \ \ | | | | | | | | | | Make `SchemaMigration.drop_table` to one SQL
| * | | | Make `SchemaMigration.drop_table` to one SQLRyuta Kamizono2016-01-301-4/+1
| | |/ / | |/| | | | | | | | | | | | | | `SchemaMigration.drop_table` is only used in tests. Simply we can use `drop_table if_exists: true`.
* | | | Merge pull request #23352 from yui-knk/move_test_conditionsRafael França2016-01-301-11/+9
|\ \ \ \ | | | | | | | | | | There is no need to define test if a connection does not support prim…
| * | | | There is no need to define test if a connection does not support primary_keyyui-knk2016-01-311-11/+9
| | |/ / | |/| |
* | | | Merge pull request #23353 from ↵Rafael França2016-01-301-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | kamipo/remove_unused_lost_connection_error_messages Remove unused `LOST_CONNECTION_ERROR_MESSAGES`
| * | | | Remove unused `LOST_CONNECTION_ERROR_MESSAGES`Ryuta Kamizono2016-01-311-6/+0
| | |/ / | |/| | | | | | | | | | | | | | `LOST_CONNECTION_ERROR_MESSAGES` was added by f384582. But currently unused from anywhere.
* | | | Merge pull request #23347 from yui-knk/explicitly_define_columns_as_interfaceRafael França2016-01-301-1/+3
|\ \ \ \ | | | | | | | | | | Explicitly define `columns` method as an interface
| * | | | Explicitly define `columns` method as an interfaceyui-knk2016-01-301-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::SchemaStatements#columns` is defined here as an interface method here. So changes to raise `NotImplementedError` same as `tables`, `views` ...etc.
* | | | Merge pull request #23342 from y-yagi/remove_unused_variableRafael França2016-01-301-1/+1
|\ \ \ \ | | | | | | | | | | remove unused variable from render test
| * | | | remove unused variable from render testyuuji.yaginuma2016-01-301-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` rails/actionpack/test/controller/render_test.rb:278: warning: assigned but unused variable - response ```
* | | | Merge pull request #23343 from y-yagi/remove_unused_requireRafael França2016-01-301-1/+0
|\ \ \ \ | | | | | | | | | | remove unused require
| * | | | remove unused requireyuuji.yaginuma2016-01-301-1/+0
| |/ / / | | | | | | | | | | | | `with_indifferent_access` had been used in `assigns` method, but has been removed in ca83436.
* | | | Allow failures for Action Cable testsRafael Mendonça França2016-01-301-0/+1
| | | |
* | | | Merge pull request #23351 from y-yagi/remove_gsub_for_action_cable_meta_tagRafael França2016-01-301-1/+0
|\ \ \ \ | | | | | | | | | | remove unnecessary gsub for `action_cable_meta_tag`
| * | | | remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | If the specified `skip_action_cable` option, so as not to output the `action_cable_meta_tag` in template, gsub is unnecessary. ref: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt#L6..L8
* | | | Merge pull request #23346 from kamipo/refactor_oid_money_precisionRafael França2016-01-302-9/+5
|\ \ \ \ | |_|/ / |/| | | Refactor `OID::Money.precision`
| * | | Refactor `OID::Money.precision`Ryuta Kamizono2016-01-302-9/+5
| |/ /
* / / Handle response_body= when body is nileileencodes2016-01-302-0/+17
|/ / | | | | | | | | | | | | | | | | There are some cases when the `body` in `response_body=` can be set to nil. One of those cases is in `actionpack-action_caching` which I found while upgrading it for Rails 5. It's not possible to run `body.each` on a `nil` body so we have to return after we run `response.reset_body!`.
* | Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\ \ | | | | | | Add an after_bundle callback in Rails plugin templates
| * | Implemented pull request changes.Ryan Manuel2016-01-292-10/+5
| | |
| * | Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-282-2/+2
| | |
| * | Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-285-2/+47
| | |
* | | Merge pull request #23338 from tawan/update-doc-request-headers-accessJon Moss2016-01-291-1/+15
|\ \ \ | | | | | | | | Add additional documentation on Headers#[] [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 08:15:59 +0000