aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not leak the Errors default proc when calling to_hash or as_jsonJean Boussier2016-09-272-1/+11
* Merge pull request #26636 from y-yagi/fix_typo_in_all_weekप्रथमेश Sonpatki2016-09-271-1/+1
|\
| * fix typo in `DateAndTime::Calculations#all_week` doc [ci skip]yuuji.yaginuma2016-09-271-1/+1
* | Merge pull request #26629 from kamipo/fix_doc_formatJon Moss2016-09-261-3/+3
|\ \ | |/ |/|
| * Fix doc format for `RecordFetchWarning` [ci skip]Ryuta Kamizono2016-09-271-3/+3
* | Merge pull request #26414 from rails/rails-commandsKasper Timm Hansen2016-09-2638-766/+1005
|\ \
| * | Apply test command changes.Kasper Timm Hansen2016-09-261-1/+3
| * | Fix server command tests.Kasper Timm Hansen2016-09-251-1/+2
| * | Fix dbconsole tests.Kasper Timm Hansen2016-09-252-28/+59
| * | Apply Rafaels review fixes.Kasper Timm Hansen2016-09-253-3/+4
| * | Fix console tests.Kasper Timm Hansen2016-09-253-7/+33
| * | Remove the old command files.Kasper Timm Hansen2016-09-2514-880/+0
| * | Per Dr. Eileen's orders :)Kasper Timm Hansen2016-09-253-5/+7
| * | Simplify auxiliary command files directory finding.Kasper Timm Hansen2016-09-251-1/+1
| * | Run engine commands through command infrastructure.Kasper Timm Hansen2016-09-256-14/+54
| * | Initial command structure.Kasper Timm Hansen2016-09-2525-160/+1176
* | | Use xor to avoid allocations in `AR::Core#hash`Sean Griffin2016-09-261-1/+1
* | | Merge pull request #26626 from alexcameron89/pg_result_docMatthew Draper2016-09-261-1/+1
|\ \ \ | |_|/ |/| |
| * | [ci skip] Update PG adapter documentationAlex Kitchens2016-09-261-1/+1
|/ /
* | Merge pull request #26622 from alexcameron89/pg_result_docJon Moss2016-09-251-4/+4
|\ \
| * | [ci skip] Clarify Postgresql DocumentationAlex Kitchens2016-09-251-4/+4
* | | Merge pull request #26579 from y-yagi/remove_unnecessary_rails_env_settingKasper Timm Hansen2016-09-252-4/+0
|\ \ \
| * | | remove unnecessary `RAILS_ENV` settingyuuji.yaginuma2016-09-222-4/+0
* | | | Merge pull request #26619 from maclover7/jm-a502703-notesJon Moss2016-09-251-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add info about a502703 to Rails 5 release notesJon Moss2016-09-251-0/+3
* | | | Use autorun when running via Rake.Kasper Timm Hansen2016-09-251-3/+13
* | | | fffffff, Add code missing in 29f0fbdKasper Timm Hansen2016-09-251-2/+2
* | | | Revise setting of run_with_rails_extension.Kasper Timm Hansen2016-09-253-13/+13
* | | | Require `active_support/testing/autorun`.Kasper Timm Hansen2016-09-251-2/+1
* | | | Merge pull request #26613 from adamcrown/save-validate-rdoc-formattingप्रथमेश Sonpatki2016-09-251-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix code formatting in `#save` RDoc [ci skip]Adam Crownoble2016-09-251-2/+2
|/ / /
* | | Merge pull request #26610 from mechanicles/as-to-active-supportJon Moss2016-09-241-1/+1
|\ \ \
| * | | AS => Active Support [ci skip]Santosh Wadghule2016-09-251-1/+1
* | | | Merge pull request #26597 from tbalthazar/26580Andrew White2016-09-243-1/+51
|\ \ \ \
| * | | | Fix ActiveSupport::TimeWithZone#inThomas Balthazar2016-09-243-1/+51
|/ / / /
* | | | Merge pull request #26515 from grosser/grosser/after_runArthur Nogueira Neves2016-09-233-4/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | switch to autorun to support after_run and patch lessMichael Grosser2016-09-231-3/+1
| * | | support minitest after_run for parity to regular minitestMichael Grosser2016-09-163-1/+25
| * | | improve test coverageMichael Grosser2016-09-162-4/+18
* | | | Merge pull request #26607 from matthewd/skip-fixture-pathMatthew Draper2016-09-242-1/+9
|\ \ \ \
| * | | | Only search fixture_path for files that can't be found directlyMatthew Draper2016-09-242-1/+9
* | | | | Merge pull request #26591 from philipqnguyen/changelog-fix-etag-templateClaudio B2016-09-231-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add #25546 and #25817 to changelog [ci skip]Philip Nguyen2016-09-231-0/+8
| | |/ / | |/| |
* | | | Merge pull request #26605 from mjhoy/fix-controller-tests-guides-get-actionप्रथमेश Sonpatki2016-09-241-4/+4
|\ \ \ \
| * | | | Fix docs for allowed params to `get` in controller tests [ci skip]Michael Hoy2016-09-231-4/+4
* | | | | Merge pull request #25670 from tdtran/fix-nil-jsonAaron Patterson2016-09-234-1/+41
|\ \ \ \ \
| * | | | | Serialize JSON attribute value nil as SQL NULL, not JSON 'null'Trung Duc Tran2016-09-234-1/+41
|/ / / / /
* | | | | Merge pull request #26563 from knugie/fix_issue_26430Aaron Patterson2016-09-231-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent circular require of proxy_wrappers.rb, Fixes #26430Wolfgang Teuber2016-09-211-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #26595 from prathamesh-sonpatki/fix-26593Aaron Patterson2016-09-233-4/+12
|\ \ \ \