aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Return true if attribute is not changed for update_attributePrathamesh Sonpatki2016-09-233-4/+12
| |/ / /
* | | | Merge pull request #26594 from y-yagi/fix_formatting_of_define_callbacksVipul A M2016-09-231-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | fix formatting of `define_callbacks` doc [ci skip]yuuji.yaginuma2016-09-231-4/+4
| |/ /
* | | Merge pull request #26589 from kirs/ad-test-request-methodArthur Nogueira Neves2016-09-222-1/+8
|\ \ \
| * | | Fix memoization bug on ActionDispatch::TestRequest#request_method=Kir Shatrov2016-09-222-1/+8
* | | | Merge pull request #26524 from y-yagi/add_check_of_argumentRichard Schneeman2016-09-222-0/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | add check of argumentyuuji.yaginuma2016-09-172-0/+11
* | | | Merge pull request #26562 from Neodelf/docsJon Moss2016-09-201-1/+1
|\ \ \ \
| * | | | [ci skip] Replace to closing tagAndrey Molchanov2016-09-201-1/+1
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-09-205-8/+10
|\ \ \ \ \
| * | | | | [ci skip] Fix wrong rdoc-ref links, the format is {}[] not []{}Prathamesh Sonpatki2016-09-141-2/+2
| * | | | | [ci skip] Fix formatting of documentation of worker_pool method from AC::Serv...Prathamesh Sonpatki2016-09-071-1/+1
| * | | | | [ci skip] Fix formatting in Action Cable Connection::Base module docsPrathamesh Sonpatki2016-09-071-1/+1
| * | | | | :nail_care: [ci skip]Prathamesh Sonpatki2016-09-071-1/+1
| * | | | | Document that redirect* don't halt exucution. We explain more on this behavio...Vipul A M2016-09-061-0/+2
| * | | | | [ci fix] Fix API documentation for Streams module from Action CablePrathamesh Sonpatki2016-09-061-4/+4
* | | | | | Merge pull request #26558 from kamipo/restore_gemfile_lock_entriesAndrew White2016-09-201-0/+2
|\ \ \ \ \ \
| * | | | | | Restore missing Gemfile.lock entriesRyuta Kamizono2016-09-201-0/+2
|/ / / / / /
* | | | | | Merge pull request #26553 from y-yagi/fix_link_to_resqueJon Moss2016-09-191-1/+1
|\ \ \ \ \ \
| * | | | | | fix link to `resque` [ci skip]yuuji.yaginuma2016-09-201-1/+1
* | | | | | | Merge pull request #26552 from rafaelfranca/fix-errors-details-storageRafael França2016-09-193-15/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Always store errors details information with symbolsRafael Mendonça França2016-09-193-15/+32
|/ / / / / /
* | | | | | Merge pull request #26447 from kamipo/reduce_array_allocationSantiago Pastorino2016-09-191-3/+1
|\ \ \ \ \ \
| * | | | | | Reduce array allocation when `where` with passed hashRyuta Kamizono2016-09-101-3/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #26543 from y-yagi/use_rails_command_in_restart_testKasper Timm Hansen2016-09-191-7/+7
|\ \ \ \ \ \
| * | | | | | use rails command in restart task testyuuji.yaginuma2016-09-191-7/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #26448 from kamipo/remove_collection_association_uniqKasper Timm Hansen2016-09-181-1/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove unnecessry `alias uniq distinct` for collection associationRyuta Kamizono2016-09-101-1/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #26534 from Neodelf/new_branch_nameJon Moss2016-09-177-7/+7
|\ \ \ \ \
| * | | | | [ci skip] Fixed commas according to Oxford comma in rdoc and guidesAndrey Molchanov2016-09-177-7/+7
* | | | | | Merge pull request #26446 from kamipo/rename_type_var_name_to_typeEileen M. Uchitelle2016-09-171-10/+8
|\ \ \ \ \ \
| * | | | | | Rename variable name that returning `type_for` to `type` from `column`Ryuta Kamizono2016-09-111-10/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #26497 from koppen/26496-touch_with_optimistic_lockingEileen M. Uchitelle2016-09-173-1/+9
|\ \ \ \ \ \
| * | | | | | Clear attribute changes after handling lockingJakob Skjerning2016-09-143-1/+9
* | | | | | | Merge pull request #26532 from Neodelf/new_branch_nameप्रथमेश Sonpatki2016-09-171-2/+11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 05:39:25 +0000