aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | [ci skip] Add changelog entry for 6d402c6Kasper Timm Hansen2017-06-111-0/+7
* | | | | | | | | | | | Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-115-5/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | set message_encryptor default cipher to aes-256-gcmAssain2017-06-125-5/+30
* | | | | | | | | | | | | Merge pull request #29412 from y-yagi/fix_29014Kasper Timm Hansen2017-06-114-18/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Generate field ids in `collection_check_boxes` and `collection_radio_buttons`yuuji.yaginuma2017-06-114-18/+28
* | | | | | | | | | | | | | Missing dots [ci skip] (#29414)Vipul A M2017-06-111-4/+4
* | | | | | | | | | | | | | Merge pull request #29268 from gsamokovarov/delegate-missing-to-guidesVipul A M2017-06-111-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Document Module#delegate_missing_to in the guidesGenadi Samokovarov2017-06-111-0/+21
* | | | | | | | | | | | | | Access EDITOR through Ruby's cross-platform ENV.Kasper Timm Hansen2017-06-111-2/+2
* | | | | | | | | | | | | | Cache: test coverage for cleanup behavior with local cache strategyEugene Kenny2017-06-102-1/+16
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Revert #25628. Incomplete change + needs a deprecation cycle.Jeremy Daer2017-06-103-5/+5
* | | | | | | | | | | | | Merge pull request #29406 from y-yagi/remove_null_allowed_optionRyuta Kamizono2017-06-101-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove `null_allowed` option from doc [ci skip]yuuji.yaginuma2017-06-101-2/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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
|/ / / / / / / /