aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update HABTM documentation in guidesJames Doyley2016-10-261-3/+1
* Merge pull request #26895 from yui-knk/use_same_class_on_transform_valuesGuillermo Iguaran2016-10-251-0/+5
|\
| * Ensure `#transform_values` of HWIDA to return HWIDAyui-knk2016-10-261-0/+5
|/
* Merge pull request #25432 from kamipo/polymorphic_reflection_is_not_using_met...Eileen M. Uchitelle2016-10-251-3/+3
|\
| * `PolymorphicReflection` is not using the methods from `ThroughReflection`Ryuta Kamizono2016-06-211-3/+3
* | WhitespaceRafael Mendonça França2016-10-251-0/+1
* | Merge pull request #26851 from Gaurav2728/update-kindlerbRafael França2016-10-253-11/+7
|\ \
| * | update kindlerb gemGaurav Sharma2016-10-213-11/+7
* | | Remove mona lisa image from the testsRafael Mendonça França2016-10-255-19/+19
* | | Fix HTML escaping in the guidesRafael Mendonça França2016-10-252-2/+2
* | | 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]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 gemPrathamesh Sonpatki2016-10-231-4/+4
* | | | 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_adapterGabi Stefanini2016-10-241-2/+2
|/ / / /
* | | | 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.4Prathamesh Sonpatki2016-10-232-20/+29
* | | | | Merge pull request #26883 from y-yagi/remove_assets_config_if_skip_sprockets_...Rafael França2016-10-242-0/+5
|\ \ \ \ \
| * | | | | remove assets config from `new_framework_defaults` if `--skip-sprockets` is trueyuuji.yaginuma2016-10-252-0/+5
* | | | | | Missing require extract_optionsAkira Matsuda2016-10-251-0/+2
* | | | | | Copy-edits on #26880Rafael Mendonça França2016-10-241-32/+52
* | | | | | Merge pull request #26880 from TempestMia/model_schema_doc_stringsRafael Mendonça França2016-10-241-44/+103
|\ \ \ \ \ \
| * | | | | | 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]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]yuuji.yaginuma2016-10-241-1/+4
|/ / / / /
* | | | | Merge release note entry for Date/Time/DateTime extensionsCarlos Antonio da Silva2016-10-231-4/+2
* | | | | Merge pull request #26871 from maclover7/jm-fix-26867Jon Moss2016-10-231-1/+2
|\ \ \ \ \
| * | | | | Small grammar fix for #26867Jon Moss2016-10-231-1/+2
|/ / / / /
* | / / / HSTS subdomains is now true, so let's fix documentation [ci skip] (#26870)प्रथमेश Sonpatki2016-10-231-1/+1
| |/ / / |/| | |
* | | | Merge pull request #26867 from bogdanvlviv/opt_loc_docsVipul A M2016-10-231-0/+1
|\ \ \ \
| * | | | Add info about updating locking column valuebogdanvlviv2016-10-231-0/+1
|/ / / /
* | | | Revert "Made ActiveRecord consistently use ActiveRecord::Type (not"Sean Griffin2016-10-238-23/+9
* | | | 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 documentationclaudiob2016-10-211-1/+6
|/ / /
* | | 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 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_toJon Moss2016-10-172-0/+22
* | | | | 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 CollectionAssociationPrathamesh Sonpatki2016-10-224-7/+22
|/ / / / /
* | | | | Merge pull request #26843 from denisovlev/strptime_timestampsRafael França2016-10-223-11/+40
|\ \ \ \ \
| * | | | | Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s)denisovlev2016-10-213-11/+40