aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
* | | | | | | | | Merge pull request #26826 from claudiob/add-requireClaudio B2016-10-211-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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.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.Charles Oliver Nutter2016-10-211-6/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Use `on_load` to trigger commandline processing codeAaron Patterson2016-10-213-5/+10
* | | | | | | | | | | Prevent the test framework from being loaded in production modeAaron Patterson2016-10-213-6/+14
* | | | | | | | | | | Merge pull request #26859 from headius/mask_use_of_rubyvm_on_jrubyAaron Patterson2016-10-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Skip test that depends on RubyVM when it is not available (JRuby).Charles Oliver Nutter2016-10-211-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Revert "Undefine assings in IntegrationTest"Rafael Mendonça França2016-10-212-10/+0
* | | | | | | | | | Merge pull request #26819 from lastgabs/add-examples-active-job-test-helperRafael França2016-10-211-0/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add examples of queue_adapter and perform_enqueued jobs to API Docs.Gabi Stefanini2016-10-211-0/+24
* | | | | | | | | | | Merge pull request #26050 from bogdanvlviv/optimistic_lockingAaron Patterson2016-10-215-20/+157
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added ability update locking_column valuebogdanvlviv2016-10-214-7/+90
| * | | | | | | | | | Fixed: Optimistic locking does not work well with null in the databasebogdanvlviv2016-10-214-15/+69
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #26855 from headius/explicit_order_callback_argsAaron Patterson2016-10-211-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Additional fix for argument-splat ordering differences.Charles Oliver Nutter2016-10-211-2/+2
* | | | | | | | | | | Merge pull request #26854 from headius/explicit_order_callback_argsAaron Patterson2016-10-211-4/+4
|\| | | | | | | | | |