Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s) | denisovlev | 2016-10-21 | 3 | -11/+40 | |
* | | | | | | | | | Merge pull request #26826 from claudiob/add-require | Claudio B | 2016-10-21 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add missing require | claudiob | 2016-10-19 | 1 | -0/+1 | |
* | | | | | | | | | | Merge pull request #26862 from headius/lazy_load_blade_for_tests | Guillermo Iguaran | 2016-10-21 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Lazy-load blade for actioncable tests; no blade on JRuby. | Charles Oliver Nutter | 2016-10-21 | 1 | -1/+2 | |
* | | | | | | | | | | | Merge pull request #26860 from headius/soft_ordering_in_yaml_dump | Kasper Timm Hansen | 2016-10-22 | 1 | -6/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Soften this test since YAML.dump may produce keys in other orders. | Charles Oliver Nutter | 2016-10-21 | 1 | -6/+4 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Use `on_load` to trigger commandline processing code | Aaron Patterson | 2016-10-21 | 3 | -5/+10 | |
* | | | | | | | | | | | Prevent the test framework from being loaded in production mode | Aaron Patterson | 2016-10-21 | 3 | -6/+14 | |
* | | | | | | | | | | | Merge pull request #26859 from headius/mask_use_of_rubyvm_on_jruby | Aaron Patterson | 2016-10-21 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Skip test that depends on RubyVM when it is not available (JRuby). | Charles Oliver Nutter | 2016-10-21 | 1 | -0/+2 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Revert "Undefine assings in IntegrationTest" | Rafael Mendonça França | 2016-10-21 | 2 | -10/+0 | |
* | | | | | | | | | | Merge pull request #26819 from lastgabs/add-examples-active-job-test-helper | Rafael França | 2016-10-21 | 1 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add examples of queue_adapter and perform_enqueued jobs to API Docs. | Gabi Stefanini | 2016-10-21 | 1 | -0/+24 | |
* | | | | | | | | | | | Merge pull request #26050 from bogdanvlviv/optimistic_locking | Aaron Patterson | 2016-10-21 | 5 | -20/+157 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Added ability update locking_column value | bogdanvlviv | 2016-10-21 | 4 | -7/+90 | |
| * | | | | | | | | | | Fixed: Optimistic locking does not work well with null in the database | bogdanvlviv | 2016-10-21 | 4 | -15/+69 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #26855 from headius/explicit_order_callback_args | Aaron Patterson | 2016-10-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Additional fix for argument-splat ordering differences. | Charles Oliver Nutter | 2016-10-21 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #26854 from headius/explicit_order_callback_args | Aaron Patterson | 2016-10-21 | 1 | -4/+4 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Explicitly unpack the expanded args to avoid execution order diff. | Charles Oliver Nutter | 2016-10-21 | 1 | -4/+4 | |
| | |/ / / / / / / / | |/| | | | | | | | |