aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26851 from Gaurav2728/update-kindlerbRafael França2016-10-253-11/+7
|\ | | | | update kindlerb gem
| * update kindlerb gemGaurav Sharma2016-10-213-11/+7
| | | | | | Ruby Kindle periodical-format ebook generator
* | Remove mona lisa image from the testsRafael Mendonça França2016-10-255-19/+19
| | | | | | | | | | This image has copyright that we are not giving so it is better to use one image that we own the copyright.
* | Fix HTML escaping in the guidesRafael Mendonça França2016-10-252-2/+2
| | | | | | | | render :html escapes the argument if not provided as html safe.
* | Merge pull request #26888 from Erol/fix-api-documentation-typoVipul A M2016-10-251-1/+1
|\ \ | | | | | | Fix small typo in ActionView API documentation [ci skip]
| * | Fix small typo in ActionView API documentation [ci skip]Erol Fornoles2016-10-251-1/+1
|/ /
* | Fix indentationRafael Mendonça França2016-10-251-1/+1
| |
* | Generate HTML not plain textRafael Mendonça França2016-10-251-1/+1
| |
* | Merge pull request #26869 from prathamesh-sonpatki/fix-brittle-mysql-testsGuillermo Iguaran2016-10-241-4/+4
|\ \ | | | | | | Fix brittle tests which were relying on the error message text from mysql2 gem
| * | Fix brittle tests which were relying on the error message text from mysql2 gemPrathamesh Sonpatki2016-10-231-4/+4
| | | | | | | | | | | | | | | | | | | | | - These tests were fixed earlier on master in https://github.com/rails/rails/commit/f13ec72664fd13d33d617103ca964a7592295854. - They started failing in first place due to change in https://github.com/brianmario/mysql2/commit/f14023fcfee9e85e6fc1b0e568048811518f8c23. - They will fail again when the message is changed in mysql2 so let's not rely on the error message.
* | | Merge pull request #26885 from lastgabs/fix-active-job-testRafael França2016-10-251-2/+2
|\ \ \ | | | | | | | | Uses queue adapter_method instead of ActiveJob::Base.queue_adapter
| * | | Uses queue adapter_method instead of ActiveJob::Base.queue_adapterGabi Stefanini2016-10-241-2/+2
|/ / / | | | | | | | | | Change ActiveJob::Base.queue_adapter to use queue_adapter method to make test code consistent.
* | | Fix plain option in the rails_guides generatorRafael Mendonça França2016-10-251-1/+1
| | |
* | | Merge pull request #26868 from prathamesh-sonpatki/use-hash-compact-from-ruby-24Rafael França2016-10-242-20/+29
|\ \ \ | | | | | | | | Use Hash#compact and Hash#compact! from Ruby 2.4
| * | | Use Hash#compact and Hash#compact! from Ruby 2.4Prathamesh Sonpatki2016-10-232-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | - Ruby 2.4 has added Hash#compact and Hash#compact! so we can use it now. - Reference: https://bugs.ruby-lang.org/issues/11818 and https://bugs.ruby-lang.org/issues/12863.
* | | | Merge pull request #26883 from ↵Rafael França2016-10-242-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/remove_assets_config_if_skip_sprockets_is_true remove assets config from `new_framework_defaults` if `--skip-sprockets` is true
| * | | | remove assets config from `new_framework_defaults` if `--skip-sprockets` is trueyuuji.yaginuma2016-10-252-0/+5
| | | | | | | | | | | | | | | | | | | | If `sprockets` is not loaded, `Rails.application.config.assets` is not defined.
* | | | | Missing require extract_optionsAkira Matsuda2016-10-251-0/+2
| | | | |
* | | | | Copy-edits on #26880Rafael Mendonça França2016-10-241-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Put a blank line after :call-seq: otherwise it will think the whole test is the call seq. * Improve some text. * Use some rdoc formatting. * Restores the documentation of table_name_prefix. [ci skip]
* | | | | Merge pull request #26880 from TempestMia/model_schema_doc_stringsRafael Mendonça França2016-10-241-44/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix model schema doc strings
| * | | | | Fix model schema doc stringsMia Zbikowski2016-10-241-44/+103
|/ / / / /
* | | | | Merge pull request #26878 from Erol/fix-guide-typoGuillermo Iguaran2016-10-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in Upgrading Ruby on Rails Guide [ci skip]
| * | | | | Fix typo in Upgrading Ruby on Rails Guide [ci skip]Erol Fornoles2016-10-241-1/+1
|/ / / / /
* | | | | Merge pull request #26876 from y-yagi/update_description_of_etagप्रथमेश Sonpatki2016-10-241-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | update description of Etag [ci skip]
| * | | | update description of Etag [ci skip]yuuji.yaginuma2016-10-241-1/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | The document is written with "only generate weak", but it can also be used to strong etag. Also, add missing entory for #24387
* | | | Merge release note entry for Date/Time/DateTime extensionsCarlos Antonio da Silva2016-10-231-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | The first release note entry mentioned #on_weekday?, but that was only added by the second PR mentioned there. To simplify reading the notes just merge the two, since they are related methods. [ci skip]
* | | | Merge pull request #26871 from maclover7/jm-fix-26867Jon Moss2016-10-231-1/+2
|\ \ \ \ | | | | | | | | | | Small grammar fix for #26867
| * | | | Small grammar fix for #26867Jon Moss2016-10-231-1/+2
|/ / / / | | | | | | | | | | | | [ci skip]
* | / / HSTS subdomains is now true, so let's fix documentation [ci skip] (#26870)प्रथमेश Sonpatki2016-10-231-1/+1
| |/ / |/| | | | | - Followup of fda5afeb
* | | Merge pull request #26867 from bogdanvlviv/opt_loc_docsVipul A M2016-10-231-0/+1
|\ \ \ | | | | | | | | Add info about updating locking column value
| * | | Add info about updating locking column valuebogdanvlviv2016-10-231-0/+1
|/ / / | | | | | | | | | | | | [ci skip] Follow #26050
* | | Revert "Made ActiveRecord consistently use ActiveRecord::Type (not"Sean Griffin2016-10-238-23/+9
| | | | | | | | | | | | | | | | | | This reverts commit 671eb742eec77b5c8281ac2a2e3976ef32a6e424. This is not a change we would like moving forward.
* | | Update mysql2 version in Gemfile.lockGuillermo Iguaran2016-10-221-4/+4
| | |
* | | Update mysql adapter error message when disconnectedGuillermo Iguaran2016-10-221-2/+2
| | |
* | | Merge pull request #26863 from claudiob/revert-26826Rafael França2016-10-221-1/+6
|\ \ \ | |/ / |/| | Revert #26826 and add documentation
| * | Revert #26826 and add documentationclaudiob2016-10-211-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a01cf703 as explained in the comment to #26826: Realized that this PR caused the following warning in Travis CI: ``` /home/travis/build/rails/rails/activesupport/lib/active_support/dependencies.rb:293: warning: loading in progress, circular require considered harmful - /home/travis/build/rails/rails/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb ``` Indeed, `active_support/core_ext/hash/indifferent_access.rb` **needs** to require `active_support/hash_with_indifferent_access.rb` in order to access the class `ActiveSupport::HashWithIndifferentAccess`. The other way around, though, is not _strictly_ required, unless someone tries (like I did in the [gist above](https://gist.github.com/claudiob/43cc7fe77ff95951538af2825a71e5ec)) to use `ActiveSupport::HashWithIndifferentAccess` by only requiring `active_support/hash_with_indifferent_access.rb` without first requiring `active_support/core_ext/hash/indifferent_access.rb`. I think the solution to this is to revert this PR and instead change the documentation to explicitly state that **developers should not require 'active_support/hash_with_indifferent_access'** if all they want is to use `ActiveSupport::HashWithIndifferentAccess` – instead they should require `active_support/core_ext/hash/indifferent_access.rb`.
* | Merge pull request #26790 from iainbeeston/type-tests-in-their-own-filesRafael França2016-10-2213-168/+266
|\ \ | | | | | | Refactored ActiveModel::Type tests into their own files
| * | Refactored ActiveModel::Type tests into their own filesIain Beeston2016-10-1513-168/+266
| | |
* | | Merge pull request #26810 from maclover7/jm-fix-26802Rafael Mendonça França2016-10-222-0/+38
|\ \ \ | | | | | | | | | | | | Convert ActionController::Parameters to a hash in button_to
| * | | Convert ActionController::Parameters to a hash in button_toJon Moss2016-10-172-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, an error would be raised saying that the method `to_param` was undefined on the instance of `ActionController::Parameters`. Now, we are checking to see if the `params` object being passed to `button_to` responds to the `permitted?` method, and if so, we will call `to_h` on it. If it does not respond to `permitted?`, then the `params` will remain unchanged. [Jon Moss, Rafael Mendonça França]
* | | | Merge pull request #26416 from prathamesh-sonpatki/fix-select-exampleRafael França2016-10-224-7/+22
|\ \ \ \ | | | | | | | | | | Fix regression caused due to removal of select method from CollectionAssociation
| * | | | Fix regression caused due to removal of select method from CollectionAssociationPrathamesh Sonpatki2016-10-224-7/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CollectionAssociation#select was removed in https://github.com/rails/rails/pull/25989 in favor of QueryMethods#select but it caused a regression when passing arguments to select and a block. - This used to work earlier in Rails 4.2 and Rails 5. See gist https://gist.github.com/prathamesh-sonpatki/a7df922273473a77dfbc742a4be4b618. - This commit restores the behavior of Rails 4.2 and Rails 5.0.0 to allow passing arguments and block at the same time but also deprecates it. - Because, these arguments do not have any effect on the output of select when select is used with a block. - Updated documentation to remove the example passing arguments and block at the same time to `CollectionProxy#select`.
* | | | Merge pull request #26843 from denisovlev/strptime_timestampsRafael França2016-10-223-11/+40
|\ \ \ \ | | | | | | | | | | Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s)
| * | | | Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s)denisovlev2016-10-213-11/+40
| | | | |
* | | | | Merge pull request #26826 from claudiob/add-requireClaudio B2016-10-211-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add missing require in active_support/hash_with_indifferent_access.rb
| * | | | | Add missing requireclaudiob2016-10-191-0/+1
| | | | | |
* | | | | | Merge pull request #26862 from headius/lazy_load_blade_for_testsGuillermo Iguaran2016-10-211-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Lazy-load blade for actioncable tests; no blade on JRuby.
| * | | | | | Lazy-load blade for actioncable tests; no blade on JRuby.Charles Oliver Nutter2016-10-211-1/+2
| | | | | | |
* | | | | | | Merge pull request #26860 from headius/soft_ordering_in_yaml_dumpKasper Timm Hansen2016-10-221-6/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Soften this test since YAML.dump may produce keys in other orders.
| * | | | | | | Soften this test since YAML.dump may produce keys in other orders.Charles Oliver Nutter2016-10-211-6/+4
| |/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 15:55:53 +0000