aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove package:clean taskJavan Makhmali2016-05-2410-10/+0
| | | | Introduced in d6f2000a67cc63aa67414c75ce77de671824ec52 and was only used by Action Cable. Now handled by Action Cable’s assets:compile task.
* Build action_cable.js with BladeJavan Makhmali2016-05-245-50/+21
|
* Merge pull request #25126 from bquorning/this-is-not-an-aliasVipul A M2016-05-241-2/+0
|\ | | | | [] and read_attribute are not aliases [ci skip]
| * [] and read_attribute are not aliases [ci skip]Benjamin Quorning2016-05-241-2/+0
|/ | | | | | The `#[]` method *used to be* an alias of `#read_attribute`, but since Rails 4 (10f6f90d9d1bbc9598bffea90752fc6bd76904cd), it will raise an exception for missing attributes. Saying that it is an alias is confusing.
* Revert "Add default exceptions affected by suppress (#25099)"Rafael Mendonça França2016-05-232-10/+0
| | | | | | | This reverts commit 28492204ee59a5aca2f3bc7b161d45724552686d. Reason: `suppress` without an argument doesn't actually tell what is supressing. Also, it can be confused with ActiveRecord::Base#suppress.
* Add default exceptions affected by suppress (#25099)Alexey Zapparov2016-05-232-0/+10
| | | | | | | | | | | | | | | | | | | | * Add default exceptions affected by suppress suppress { do_something_that_might_fail } # instead of begin do_something_that_might_fail rescue end # or do_something_that_might_fail rescue nil * Do not add default exceptions list constant [Rafael Mendonça França + Alexey Zapparov]
* Merge pull request #25114 from y-yagi/remove_qualified_const_from_guideJon Moss2016-05-231-71/+0
|\ | | | | remove deprecated `Module#qualified_const_` from guide [ci skip]
| * remove deprecated `Module#qualified_const_` from guide [ci skip]yuuji.yaginuma2016-05-231-71/+0
| | | | | | | | Follow up to #17845.
* | Merge pull request #25110 from andrii/fix_scaffold_cssRafael França2016-05-231-8/+4
|\ \ | | | | | | Fix and optimize scaffold CSS
| * | Fix and optimize scaffold CSS [ci skip]Andrii Ponomarov2016-05-221-8/+4
| |/
* / Respect `log_warning_on_csrf_failure` setting for all CSRF failuresMatthew Caruana Galizia2016-05-232-1/+34
|/ | | | | | | | | | | | CSRF verification for non-XHR GET requests (cross-origin `<script>` tags) didn't check this flag before logging failures. Setting `config.action_controller.log_warning_on_csrf_failure = false` now disables logging for these CSRF failures as well. Closes #25086. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* Remove Blade gem dependencyVipul A M2016-05-213-2/+41
| | | | | | | | | Apps that depend on Action Cable don't need Blade for app development, so we can remove the gem dependency. We do need Blade for Action Cable dev, so we bundle it in the Gemfile. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* Merge pull request #25076 from jeroenvisser101/keep-to-max-lengthSean Griffin2016-05-212-2/+4
|\ | | | | Change comments to not exceed 80 characters
| * Change comments to not exceed 80 charactersJeroen Visser2016-05-192-2/+4
| | | | | | | | Other generated files do keep to this, but action cable doesn't.
* | Merge pull request #25101 from maclover7/jm-rm-space-1Kasper Timm Hansen2016-05-211-5/+5
|\ \ | | | | | | Remove space, properly italicize
| * | Remove space, properly italicizeJon Moss2016-05-211-5/+5
| | | | | | | | | | | | | | | | | | Difference in rendering --> https://gist.github.com/maclover7/a50ff9231eb825c39c77cd5858af6d9a [ci skip]
* | | Merge pull request #25100 from maclover7/jm-add-backticksKasper Timm Hansen2016-05-211-1/+1
|\ \ \ | |/ / |/| | Add backticks to `config/secrets.yml`
| * | Add backticks to `config/secrets.yml`Jon Moss2016-05-211-1/+1
|/ / | | | | | | [ci skip]
* | Merge pull request #24850 from maclover7/jm-actioncable-docsJon Moss2016-05-212-4/+4
|\ \ | | | | | | Pass over Action Cable docs
| * | Pass over Action Cable docsJon Moss2016-05-212-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #24170 from maclover7/fix-24168Rafael França2016-05-211-2/+1
|\ \ \ | | | | | | | | Un-hide helper and assets options for controller generator
| * | | Un-hide helper and assets options for controller generatorJon Moss2016-03-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These options were hidden via 9b36cf0fa4cbdcb2e2072ef1b8179a98b13efce3, but these options have tests written for them, and I believe that they are supposed to be public API. Fixes #24168.
* | | | Merge pull request #24862 from maclover7/jm-ar-fixesRafael França2016-05-211-2/+2
|\ \ \ \ | | | | | | | | | | Add missing `the`
| * | | | Add missing `the`Jon Moss2016-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #25093 from Erol/activerecord-transaction-serialization-errorRafael França2016-05-216-3/+163
|\ \ \ \ \ | |_|_|/ / |/| | | | Introduce AR::TransactionSerializationError for transaction serialization failures or deadlocks
| * | | | Add AR::TransactionSerializationError for transaction serialization failures ↵Erol Fornoles2016-05-216-3/+163
| | | | | | | | | | | | | | | | | | | | or deadlocks
* | | | | Use #distinct instead of #uniq in the guides [ci skip] (#25098)Junya Ogura2016-05-211-1/+1
| | | | | | | | | | | | | | | * #uniq will be deprecated, see: rails/rails@adfab2d
* | | | | Added a shared section to config/secrets.yml that will be loaded for all ↵David Heinemeier Hansson2016-05-214-3/+46
| | | | | | | | | | | | | | | | | | | | environments
* | | | | Whitespaces [ci skip]Rafael Mendonça França2016-05-211-0/+1
| | | | |
* | | | | Add CHANGELOG.md reference for #24958 (#25094)Jon Moss2016-05-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry for forgetting to include it in my original PR :grimacing: r? @rafaelfranca [ci skip]
* | | | | Fix Hash#from_xml with frozen strings (#24718)Marek Kirejczyk2016-05-212-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Hash#from_xml works with frozen strings Fixes #24647 * Fix rexml engine test [Marek Kirejczyk + Rafael Mendonça França]
* | | | | Merge pull request #24732 from y-yagi/update_record_specified_in_the_keyRafael França2016-05-212-1/+18
|\ \ \ \ \ | | | | | | | | | | | | update record specified in key
| * | | | | update record specified in keyyuuji.yaginuma2016-04-272-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `#first_or_initialize` does not use attributes to data acquisition. Therefore, there is a possibility of updating the different record than the one specified in the key, I think this is not expected behavior.
* | | | | | Merge pull request #24918 from prathamesh-sonpatki/cable-assetsRafael França2016-05-214-5/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cable: Generate .js or .coffee files while generating channel as per the javascript engine of the application
| * | | | | | Cable: Generate .js or .coffee files while generating channel as per the ↵Prathamesh Sonpatki2016-05-174-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javascript engine of the application - Now we will detect what javascript engine user is using and based on that we will generate either `.js` or `.coffee` version of the channel file. - This also needs a change in coffee-rails to override the `js_template` method. Related PR https://github.com/rails/coffee-rails/pull/72. - Currently coffee-rails gem sets `config.app_generators.javascript_engine` to `:coffee` and using this information we override the `js_template` to set the extension as `.coffee` in coffee-rails gem. - Using this approach, we can keep the `channel.js` and `channel.coffee` files in the Rails repository itself. - Additionally the `js_template` method can act as public interface for coffee-rails gem to hook into and change the extension to `.coffee` without maintaining the actual asset files. [Prathamesh Sonpatki, Matthew Draper]
* | | | | | | Merge pull request #24923 from vipulnsward/24816-add-labelRafael França2016-05-213-6/+25
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add empty label to empty options tag
| * | | | | | Confirm with the specification when generating emtpy option for select with ↵Vipul A M2016-05-213-6/+25
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `include_blank: true` option. We now generate option with empty label, example: `<select id="places" name="places"><option value="" label=" "></option></select>` for include_blank: true. This is only done, if content is missing on the option, and we providing the value from this option. Fixes #24816
* | | | | | Merge pull request #25092 from y-yagi/add_23980_to_release_notesप्रथमेश Sonpatki2016-05-211-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | add #23980 to release notes [ci skip]
| * | | | | | add #23980 to release notes [ci skip]yuuji.yaginuma2016-05-211-0/+3
| | | | | | |
* | | | | | | Merge pull request #24958 from maclover7/fix-24955Rafael França2016-05-202-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix ActiveRecord::LogSubscriber edge case
| * | | | | | | Fix ActiveRecord::LogSubscriber edge caseJon Moss2016-05-102-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an attribute was of the binary type, and also was a Hash, it would previously not be logged, and instead raise an error saying that `bytesize` was not defined for the `attribute.value` (a `Hash`). Now, as is done on 4-2-stable, the attribute's database value is `bytesize`d, and then logged out to the terminal. Reproduction script: ```ruby require 'active_record' require 'minitest/autorun' require 'logger' ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:') ActiveRecord::Base.logger = Logger.new(STDOUT) ActiveRecord::Schema.define do create_table :posts, force: true do |t| t.binary :preferences end end class Post < ActiveRecord::Base serialize :preferences end class BugTest < Minitest::Test def test_24955 Post.create!(preferences: {a: 1}) assert_equal 1, Post.count end end ```
* | | | | | | | Revert "Make sure the cache is always populated"Rafael Mendonça França2016-05-202-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0ce7eae7418f1b9bb06b351c1f26d50c3674c0d0. Tests were broken https://travis-ci.org/rails/rails/jobs/131850726#L520
* | | | | | | | Merge pull request #24984 from kamipo/remove_magic_comment_in_schema.rbRafael França2016-05-202-8/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove magic comment in generated `schema.rb`
| * | | | | | | | Remove magic comment in generated `schema.rb`Ryuta Kamizono2016-05-122-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5.0 has been dropped Ruby 1.9 support. I think no need magic comment anymore.
* | | | | | | | | Add more test coverage to layoutsRafael Mendonça França2016-05-201-4/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rafael Mendonça França + Nick Sutterer + thedarkone]
* | | | | | | | | Make sure the cache is always populatedAaron Patterson2016-05-202-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we don't have to make multiple calls on anonymous controllers
* | | | | | | | | Merge pull request #25041 from maclover7/jm-actionviewAaron Patterson2016-05-201-9/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [Action View] Don't create middleman `DetailsKey` instance
| * | | | | | | | | [Action View] Don't create middleman `DetailsKey` instanceJon Moss2016-05-161-9/+3
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of this is `nodoc`'ed, so we shouldn't have to worry about breaking changes, if there are any -- all internal API :).
* | | | | | | | | Merge pull request #25085 from ↵Arthur Nogueira Neves2016-05-201-7/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bquorning/update-comment-for-retrieve_connection_pool Update comment for #retrieve_connection_pool
| * | | | | | | | | [ci skip] Update retrieve_connection_pool commentBenjamin Quorning2016-05-201-7/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After PR https://github.com/rails/rails/pull/24844 the documentation for `#retrieve_connection_pool` was out of date. This commit changes: - the reference from `@class_to_pool` to `@owner_to_pool`. - with newer Rubies, `#fetch` isn't significantly slower than `#[]`. Since Rails 5 requires Ruby >= 2.2.2, we can just use `#fetch` here.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 19:16:32 +0000