aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Generate field ids in `collection_check_boxes` and `collection_radio_buttons`yuuji.yaginuma2017-06-114-18/+28
* Split up the cache test suite so it's easier to understand and extend (#29404)Jeremy Daer2017-06-1020-1359/+1383
* Merge pull request #29403 from yasslab/add-backquote-to-counter-cacheRichard Schneeman2017-06-091-1/+1
|\
| * [ci skip] Add backquote to :counter_cache optionYohei Yasukawa2017-06-101-1/+1
|/
* Make i18n test match the description of the testGuillermo Iguaran2017-06-091-1/+1
* Merge pull request #29361 from metaskills/sqlserversetup-take2Guillermo Iguaran2017-06-091-2/+2
|\
| * Ensure MSSQL password uses real ENV var.Ken Collins2017-06-051-2/+2
* | Merge pull request #29398 from ydakuka/patch-1Richard Schneeman2017-06-091-1/+1
|\ \
| * | [ci skip] Fix link in active_record_postgresql.mdYauheni Dakuka2017-06-091-1/+1
|/ /
* | Merge pull request #29397 from ydakuka/patch-1Vipul A M2017-06-091-1/+1
|\ \
| * | Fix link in active_record_postgresql.mdYauheni Dakuka2017-06-091-1/+1
* | | Merge pull request #29396 from ydakuka/patch-2Vipul A M2017-06-091-1/+1
|\ \ \ | |/ / |/| |
| * | remove the extra comma in association_basics.mdYauheni Dakuka2017-06-091-1/+1
|/ /
* | Don't rely on the @view_renderer being defined.Kasper Timm Hansen2017-06-081-2/+2
* | Merge pull request https://github.com/rails/rails/pull/28637 from st0012/fix-...Kasper Timm Hansen2017-06-086-33/+42
* | Use a hash to record every partial's cache hit status instead of sharing a bo...Stan Lo2017-06-087-3/+51
* | Merge pull request #29388 from y-yagi/bump_capybaraKasper Timm Hansen2017-06-081-2/+2
|\ \
| * | Bundle capybara 2.14.1 that includes fix for Ruby warningsyuuji.yaginuma2017-06-081-2/+2
|/ /
* | Merge pull request #29386 from y-yagi/remove_unreachable_codeGuillermo Iguaran2017-06-071-8/+1
|\ \
| * | Remove unreachable codeyuuji.yaginuma2017-06-081-8/+1
* | | Don't support namespace in form_with.Kasper Timm Hansen2017-06-071-18/+0
* | | Move slicing to initializer.Kasper Timm Hansen2017-06-072-2/+2
* | | Cache: write_multi (#29366)Jeremy Daer2017-06-063-6/+100
* | | Merge pull request #29377 from edwardmp/fix-upgrading-docsRafael França2017-06-061-1/+1
|\ \ \ | |/ / |/| |
| * | Update upgrading guide w.r.t. Parameters to use other example method than sli...edwardmp2017-06-061-1/+1
|/ /
* | Merge pull request #28868 from yahonda/pg10_oid_unknown_to_textMatthew Draper2017-06-071-8/+8
|\ \
| * | PostgreSQL 10 converts unknown OID 705 to text 25Yasuo Honda2017-06-061-8/+8
* | | Remove invalid entry from the guides index pageRobin Dupret2017-06-061-5/+0
* | | Tiny documentation fixes [ci skip]Robin Dupret2017-06-062-6/+6
* | | Merge pull request #29362 from kamipo/remove_redundant_assert_nothing_raisedMatthew Draper2017-06-063-11/+0
|\ \ \
| * | | Remove redundant `assert_nothing_raised` before another assertionsRyuta Kamizono2017-06-063-11/+0
| | |/ | |/|
* | | Merge pull request #29370 from koic/fix_test_pluck_without_column_names_oracleMatthew Draper2017-06-061-2/+5
|\ \ \ | |_|/ |/| |
| * | Fix `test_pluck_without_column_names` when using OracleKoichi ITO2017-06-061-2/+5
* | | Let's test nokogiri 1.8 against edge Rails, and vice versaAkira Matsuda2017-06-061-8/+8
* | | Merge pull request #29364 from lostapathy/patch-2Ryuta Kamizono2017-06-061-1/+0
|\ \ \
| * | | Remove html tag making markdown misrender [ci skip]Joe Francis2017-06-051-1/+0
|/ / /
* / / Fix indentation + Add backticks [ci skip]Ryuta Kamizono2017-06-061-2/+4
|/ /
* / [ci skip] UNIQUE constraint affects not only INSERT but also UPDATERyuta Kamizono2017-06-061-1/+1
|/
* Merge pull request #29356 from kamipo/testing_reserved_word_test_for_all_adap...Eileen M. Uchitelle2017-06-052-151/+132
|\
| * Testing `ReservedWordTest` for all adaptersRyuta Kamizono2017-06-052-151/+132
* | Remove deprecated passing of string to :if/:unless (#29357)Joe Francis2017-06-061-1/+1
|/
* Merge pull request #29347 from prathamesh-sonpatki/rm-assert-nothin-raisedEileen M. Uchitelle2017-06-041-3/+3
|\
| * Remove assert_nothing_raised, as test is already testing the required concernsPrathamesh Sonpatki2017-06-031-3/+3
* | Don't mark the schema loaded until it's really finishedMatthew Draper2017-06-051-3/+5
* | Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-0439-150/+134
|\ \
| * | Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-0336-125/+69
| * | Implement mattr_acessor :default optionGenadi Samokovarov2017-06-033-25/+65
* | | Merge pull request #29351 from vipulnsward/unnecessary-assignmentMatthew Draper2017-06-041-3/+3
|\ \ \
| * | | Don't create extra assignment, just returnVipul A M2017-06-041-3/+3
|/ / /
* | | Merge pull request #29348 from andrehjr/fix-typo-route-definition-ambiguousMatthew Draper2017-06-041-1/+1
|\ \ \ | |_|/ |/| |