aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |_|/ |/| |
| * | Fix typo on error message when route definition is ambiguous.André Luis Leal Cardoso Junior2017-06-031-1/+1
|/ /
* | [ci skip] Fix typo in the system tests docsPrathamesh Sonpatki2017-06-031-1/+1
* | [ci skip] Add missing `be`Prathamesh Sonpatki2017-06-031-1/+1
* | Merge pull request #29344 from y-yagi/fix_doc_formatKasper Timm Hansen2017-06-031-14/+14
|\ \ | |/ |/|
| * Fix formatting of `direct` and `resolve` doc [ci skip]yuuji.yaginuma2017-06-031-14/+14
* | Merge pull request #29342 from koic/change_application_js_included_in_rails_appMatthew Draper2017-06-031-3/+3
|\ \
| * | Change default application.js included in new Rails app [ci skip]Koichi ITO2017-06-031-3/+3
* | | Merge pull request #29343 from koic/remove_redundant_default_scope_testsMatthew Draper2017-06-031-10/+0
|\ \ \ | |/ / |/| |
| * | Remove a redundant default_scope testsKoichi ITO2017-06-031-10/+0
|/ /
* | Merge pull request #29340 from lucascaton/masterMatthew Draper2017-06-031-4/+14
|\ \ | |/ |/|
| * Make Rails welcome page responsiveLucas Caton2017-06-031-4/+14
|/
* Merge pull request #29079 from orhantoy/feature/fix-scaffold_controller-gener...Eileen M. Uchitelle2017-06-021-1/+1
|\
| * [ci skip] Fix `scaffold_controller` generator usageOrhan Toy2017-05-291-1/+1
* | Merge pull request #29101 from ccarruitero/system_guideEileen M. Uchitelle2017-06-021-10/+8
|\ \
| * | some typos and rephrasing in system test guide [ci skip]Cesar Carruitero2017-05-161-10/+8
* | | Merge pull request #29135 from Nerian/document_support_for_composite_primary_...Eileen M. Uchitelle2017-06-021-0/+19
|\ \ \