aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Added nil case handling to allow rollback migration in case oftravis.h.oneill@gmail.com2016-08-174-5/+31
| |/ / / / / / /
* | | | | | | | Merge pull request #24099 from k0kubun/preserve-readonlyRafael Mendonça França2016-08-185-4/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Preserve readonly flag only for readonly associationTakashi Kokubun2016-07-305-4/+29
* | | | | | | | | Merge pull request #26200 from kamipo/remove_unnecessary_ordinal_methodsRafael França2016-08-183-93/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unnecessary ordinal methods for collection associationRyuta Kamizono2016-08-183-93/+84
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25999 from kamipo/remove_sanitize_conditionsRafael França2016-08-183-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Deprecate `sanitize_conditions`. Use `sanitize_sql` insteadRyuta Kamizono2016-08-183-4/+8
* | | | | | | | | | Merge pull request #26197 from kamipo/remove_unnecessary_test_sql_for_insert_...Rafael França2016-08-182-9/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary `test_sql_for_insert_with_returning_disabled`Ryuta Kamizono2016-08-182-9/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #26214 from philnash/active-job-default-queueClaudio B2016-08-181-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Updates ActiveJob guide on default runner.Phil Nash2016-08-181-3/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #26193 from iancanderson/ia-document-i18n-required-messageJon Moss2016-08-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | i18n documentation for required belongs_to messageIan C. Anderson2016-08-171-0/+1
| |/ / / / / / /
* | | | | | | | Change method visibility to be privateRafael Mendonça França2016-08-171-57/+57
* | | | | | | | Push :defaults extraction down one levelRafael Mendonça França2016-08-172-60/+78
|/ / / / / / /
* | | | | | | Merge pull request #26192 from greenbigfrog/patch-2Jon Moss2016-08-171-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix #26187Jonathan2016-08-171-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #26188 from greenbigfrog/patch-2प्रथमेश Sonpatki2016-08-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix diffrent naming in getting_started.mdJonathan2016-08-171-1/+1
|/ / / / / /
* | | | | | Merge pull request #25396 from kamipo/fix_error_message_for_out_of_range_inte...Rafael França2016-08-171-1/+1
|\ \ \ \ \ \
| * | | | | | Fix error message for out of range byte size integer value for consistencyRyuta Kamizono2016-08-071-1/+1
* | | | | | | Merge pull request #25628 from ysksn/optionsRafael Mendonça França2016-08-174-5/+11
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG.md for #25628 [ci skip]Yosuke Kabuto2016-07-024-5/+11
* | | | | | | | Merge pull request #26186 from yasulab/fix-link-in-rails5-release-noteGuillermo Iguaran2016-08-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix link in Rails 5.0 Release Note [ci skip]Yohei YASUKAWA2016-08-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #25976 from kamipo/pluck_uses_loaded_targetRafael França2016-08-173-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | `pluck` should use `records` (`load_target`) when `loaded?` is trueRyuta Kamizono2016-08-043-2/+20
* | | | | | | | | Fix indentationRafael Mendonça França2016-08-171-3/+3
* | | | | | | | | Merge pull request #25987 from aquajach/masterRafael Mendonça França2016-08-172-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check if order contains comma first in does_not_support_reverse?Jack Chen Songyong2016-07-291-1/+1
| * | | | | | | | | have does_not_support_reverse? support sql functions with commas in nested br...Jack2016-07-292-1/+10
* | | | | | | | | | Merge pull request #26185 from y-yagi/refactor_commands_tasksRafael França2016-08-174-164/+132
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refactor `CommandsTasks`yuuji.yaginuma2016-08-174-164/+132
* | | | | | | | | | | Merge pull request #26002 from kamipo/sql_for_insert_should_be_called_inside_...Rafael França2016-08-173-8/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | `sql_for_insert` should be called inside `exec_insert`Ryuta Kamizono2016-08-063-8/+19
* | | | | | | | | | | | Merge pull request #26009 from kamipo/fix_inconsistent_finder_methods_signatureRafael França2016-08-173-49/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix inconsistent the signature of finder methods for collection associationRyuta Kamizono2016-08-163-49/+38
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #25862 from prathamesh-sonpatki/start-documenting-ac-testc...प्रथमेश Sonpatki2016-08-171-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Start documenting ActionController::TestCase againPrathamesh Sonpatki2016-08-171-6/+12
* | | | | | | | | | | | | Merge pull request #26021 from kamipo/finder_bang_method_should_call_non_bang...Rafael França2016-08-172-16/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Finder bang method should call non bang methodRyuta Kamizono2016-08-162-16/+56
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #26037 from monmonmon/masterRafael França2016-08-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Check if the logger exists before trying to use itmonmon2016-08-031-1/+1
* | | | | | | | | | | | | | Merge pull request #26072 from kamipo/extract_case_sensitive_handlerRafael Mendonça França2016-08-176-51/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Extract `PredicateBuilder::CaseSensitiveHandler`Ryuta Kamizono2016-08-166-51/+51
* | | | | | | | | | | | | | | Merge pull request #26121 from MaxLap/fix_count_with_left_joinsRafael Mendonça França2016-08-164-16/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix count which would sometimes force a DISTINCTMaxime Lapointe2016-08-164-16/+28
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #25671 from kamipo/dont_handle_as_associated_predicate_if_...Rafael França2016-08-165-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Do not handle as an associated predicate if a table has the columnRyuta Kamizono2016-08-165-5/+16
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #26000 from kamipo/remove_sanitizeRafael França2016-08-162-13/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |