Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #26896 from j-dexx/update_habtm_docs | Vipul A M | 2016-10-26 | 1 | -3/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update HABTM documentation in guides | James Doyley | 2016-10-26 | 1 | -3/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #26895 from yui-knk/use_same_class_on_transform_values | Guillermo Iguaran | 2016-10-25 | 1 | -0/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Ensure `#transform_values` of HWIDA to return HWIDA | yui-knk | 2016-10-26 | 1 | -0/+5 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #25432 from kamipo/polymorphic_reflection_is_not_using_met... | Eileen M. Uchitelle | 2016-10-25 | 1 | -3/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | `PolymorphicReflection` is not using the methods from `ThroughReflection` | Ryuta Kamizono | 2016-06-21 | 1 | -3/+3 | |
* | | | | | | | Whitespace | Rafael Mendonça França | 2016-10-25 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #26851 from Gaurav2728/update-kindlerb | Rafael França | 2016-10-25 | 3 | -11/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | update kindlerb gem | Gaurav Sharma | 2016-10-21 | 3 | -11/+7 | |
* | | | | | | | | Remove mona lisa image from the tests | Rafael Mendonça França | 2016-10-25 | 5 | -19/+19 | |
* | | | | | | | | Fix HTML escaping in the guides | Rafael Mendonça França | 2016-10-25 | 2 | -2/+2 | |
* | | | | | | | | Merge pull request #26888 from Erol/fix-api-documentation-typo | Vipul A M | 2016-10-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix small typo in ActionView API documentation [ci skip] | Erol Fornoles | 2016-10-25 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Fix indentation | Rafael Mendonça França | 2016-10-25 | 1 | -1/+1 | |
* | | | | | | | | Generate HTML not plain text | Rafael Mendonça França | 2016-10-25 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #26869 from prathamesh-sonpatki/fix-brittle-mysql-tests | Guillermo Iguaran | 2016-10-24 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix brittle tests which were relying on the error message text from mysql2 gem | Prathamesh Sonpatki | 2016-10-23 | 1 | -4/+4 | |
* | | | | | | | | | Merge pull request #26885 from lastgabs/fix-active-job-test | Rafael França | 2016-10-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Uses queue adapter_method instead of ActiveJob::Base.queue_adapter | Gabi Stefanini | 2016-10-24 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Fix plain option in the rails_guides generator | Rafael Mendonça França | 2016-10-25 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #26868 from prathamesh-sonpatki/use-hash-compact-from-ruby-24 | Rafael França | 2016-10-24 | 2 | -20/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use Hash#compact and Hash#compact! from Ruby 2.4 | Prathamesh Sonpatki | 2016-10-23 | 2 | -20/+29 | |
* | | | | | | | | | | Merge pull request #26883 from y-yagi/remove_assets_config_if_skip_sprockets_... | Rafael França | 2016-10-24 | 2 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove assets config from `new_framework_defaults` if `--skip-sprockets` is true | yuuji.yaginuma | 2016-10-25 | 2 | -0/+5 | |
* | | | | | | | | | | | Missing require extract_options | Akira Matsuda | 2016-10-25 | 1 | -0/+2 | |
* | | | | | | | | | | | Copy-edits on #26880 | Rafael Mendonça França | 2016-10-24 | 1 | -32/+52 | |
* | | | | | | | | | | | Merge pull request #26880 from TempestMia/model_schema_doc_strings | Rafael Mendonça França | 2016-10-24 | 1 | -44/+103 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix model schema doc strings | Mia Zbikowski | 2016-10-24 | 1 | -44/+103 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #26878 from Erol/fix-guide-typo | Guillermo Iguaran | 2016-10-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix typo in Upgrading Ruby on Rails Guide [ci skip] | Erol Fornoles | 2016-10-24 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #26876 from y-yagi/update_description_of_etag | प्रथमेश Sonpatki | 2016-10-24 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | update description of Etag [ci skip] | yuuji.yaginuma | 2016-10-24 | 1 | -1/+4 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge release note entry for Date/Time/DateTime extensions | Carlos Antonio da Silva | 2016-10-23 | 1 | -4/+2 | |
* | | | | | | | | | | Merge pull request #26871 from maclover7/jm-fix-26867 | Jon Moss | 2016-10-23 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Small grammar fix for #26867 | Jon Moss | 2016-10-23 | 1 | -1/+2 | |
|/ / / / / / / / / / | ||||||
* | / / / / / / / / | HSTS subdomains is now true, so let's fix documentation [ci skip] (#26870) | प्रथमेश Sonpatki | 2016-10-23 | 1 | -1/+1 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #26867 from bogdanvlviv/opt_loc_docs | Vipul A M | 2016-10-23 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add info about updating locking column value | bogdanvlviv | 2016-10-23 | 1 | -0/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Revert "Made ActiveRecord consistently use ActiveRecord::Type (not" | Sean Griffin | 2016-10-23 | 8 | -23/+9 | |
* | | | | | | | | | Update mysql2 version in Gemfile.lock | Guillermo Iguaran | 2016-10-22 | 1 | -4/+4 | |
* | | | | | | | | | Update mysql adapter error message when disconnected | Guillermo Iguaran | 2016-10-22 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #26863 from claudiob/revert-26826 | Rafael França | 2016-10-22 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Revert #26826 and add documentation | claudiob | 2016-10-21 | 1 | -1/+6 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26790 from iainbeeston/type-tests-in-their-own-files | Rafael França | 2016-10-22 | 13 | -168/+266 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Refactored ActiveModel::Type tests into their own files | Iain Beeston | 2016-10-15 | 13 | -168/+266 | |
* | | | | | | | | | Merge pull request #26810 from maclover7/jm-fix-26802 | Rafael Mendonça França | 2016-10-22 | 2 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Convert ActionController::Parameters to a hash in button_to | Jon Moss | 2016-10-17 | 2 | -0/+22 | |
* | | | | | | | | | | Merge pull request #26416 from prathamesh-sonpatki/fix-select-example | Rafael França | 2016-10-22 | 4 | -7/+22 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix regression caused due to removal of select method from CollectionAssociation | Prathamesh Sonpatki | 2016-10-22 | 4 | -7/+22 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #26843 from denisovlev/strptime_timestamps | Rafael França | 2016-10-22 | 3 | -11/+40 | |
|\ \ \ \ \ \ \ \ \ \ |