aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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.
* | | | | | | | | | | Merge pull request #25084 from y-yagi/fix_module_nameVipul A M2016-05-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | fix module name [ci skip]
| * | | | | | | | | | fix module name [ci skip]yuuji.yaginuma2016-05-201-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25080 from maclover7/jm-add-oxfordRafael França2016-05-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add back in Oxford Comma
| * | | | | | | | | | Add back in Oxford CommaJon Moss2016-05-191-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per [API documentation guidelines](http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#oxford-comma) [ci skip]
* | | | | | | | | | Merge pull request #25070 from josedonizetti/fix_example_routes_docArthur Nogueira Neves2016-05-191-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | fix named route example [ci skip]
| * | | | | | | | | fix named route example [ci skip]Jose Donizetti2016-05-191-3/+3
| | | | | | | | | |
* | | | | | | | | | Support for unified Integer class in Ruby 2.4+Jeremy Daer2016-05-1843-119/+116
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.4 unifies Fixnum and Bignum into Integer: https://bugs.ruby-lang.org/issues/12005 * Forward compat with new unified Integer class in Ruby 2.4+. * Backward compat with separate Fixnum/Bignum in Ruby 2.2 & 2.3. * Drops needless Fixnum distinction in docs, preferring Integer.
* | | | | | | | | Merge pull request #19428 from bdmac/fix_safe_buffer_titleizeRafael Mendonça França2016-05-181-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Inflector#titleize to work with SafeBuffer
| * | | | | | | | | Fixes Inflector#titleize to work with SafeBufferBrian McManus2015-03-203-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way Inflector#titleize was implemented did not work properly when called on a SafeBuffer object. Using the global `$&` variable in the gsub resulted in calling capitalize on a nil object for reasons I still do not fully understand. Removing the UNSAFE_STRING_METHODS override for the gsub method in SafeBuffer "fixed" the bug but is obviously unacceptable. An example of this is very easy to see in rails console: ActiveSupport::SafeBuffer.new("my test").titleize > NoMethodError: undefined method `capitalize' for nil:NilClass Using the non global version of gsub with a |match| arg passed to the block fixes the problem. Again I do not quite understand why. I noticed that other parts of Inflector were already using the standard block arg version of gsub so I don't think it should be a problem to convert this method to using it as well.
* | | | | | | | | | Merge pull request #25067 from ro31337/patch-2Rafael França2016-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Improve method description
| * | | | | | | | | | Improve method descriptionRoman Pushkin2016-05-181-0/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | Method description improved to reflect little bit more complicated scenario when names are camel-cased.
* | | | | | | | | | Merge pull request #25066 from mohitnatoo/rails-validation-happensRafael França2016-05-181-4/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Removing redundant 'happens' in callbacks documentation
| * | | | | | | | | - removing redundant 'happens' in documentation [ci skip]Mohit Natoo2016-05-191-4/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25059 from maclover7/jm-capitalize-md5Rafael França2016-05-172-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | `md5` --> `MD5`
| * | | | | | | | | `md5` --> `MD5`Jon Moss2016-05-172-4/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry, I missed a few places in my last PR. This should be the last of 'em :grimacing:
* | | | | | | | | Merge pull request #25052 from matkoniecz/2008_is_not_recentJon Moss2016-05-171-3/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | update to make it less obvious that this guide is from 2008/2009