aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #27355 from yukideluxe/fixtures-deleted-tablesKasper Timm Hansen2016-12-216-3/+28
|\
| * fix #create_fixtures when equal table names in different databasesJulia Lopez2016-12-216-3/+28
|/
* Fix grammar in asset tag documentationeileencodes2016-12-201-1/+1
* Improve `javascript_include_tag` documentation (#27403)Pablo Ifrán2016-12-201-5/+24
* Merge pull request #27412 from maclover7/jm-ruby-24Kasper Timm Hansen2016-12-203-5/+6
|\
| * Add Ruby v2.4.0-rc1 to Travis matrixJon Moss2016-12-201-0/+1
| * Limit length of secret being passedJon Moss2016-12-201-3/+3
| * Bump concurrent-ruby and sprocketsJon Moss2016-12-201-2/+2
|/
* [ci skip] Update initialization guide samples.Kasper Timm Hansen2016-12-201-81/+84
* Merge pull request #27414 from matthewd/fix-xml-vs-html-assertionMatthew Draper2016-12-211-12/+12
|\
| * Revise the "XML is not HTML" testMatthew Draper2016-12-201-12/+12
* | Merge pull request #27408 from matthewd/charset-fixMatthew Draper2016-12-203-5/+14
|\ \
| * | Only default the response charset when it is first setMatthew Draper2016-12-203-5/+14
| |/
* | Merge pull request #27146 from maclover7/jm-fix-27145Eileen M. Uchitelle2016-12-192-2/+10
|\ \
| * | Do not clear HTTP_COOKIES header after requestJon Moss2016-12-112-2/+10
* | | Merge pull request #27391 from y-yagi/make_work_test_tool_with_line_filterKasper Timm Hansen2016-12-191-0/+3
|\ \ \
| * | | make work bin/test scripts with line filteryuuji.yaginuma2016-12-171-0/+3
* | | | Merge pull request #27407 from cemonti/masterEileen M. Uchitelle2016-12-191-2/+2
|\ \ \ \
| * | | | Fix typo in channel generator usage messageCarlos Eduardo Monti2016-12-191-2/+2
|/ / / /
* | | | Merge pull request #27365 from baweaver/patch-1Eileen M. Uchitelle2016-12-191-0/+8
|\ \ \ \
| * | | | Add note on defaults block optionBrandon Weaver2016-12-141-0/+8
* | | | | Merge pull request #27388 from maclover7/jm-argvEileen M. Uchitelle2016-12-192-0/+17
|\ \ \ \ \
| * | | | | `ARGV.shift` before calling Rails generatorsJon Moss2016-12-172-0/+17
* | | | | | Merge pull request #27400 from kamipo/remove_useless_test_supports_primary_keyEileen M. Uchitelle2016-12-191-6/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Remove useless `test_supports_primary_key`Ryuta Kamizono2016-12-191-6/+0
* | | | | | `protected` here doesn't protect anythingAkira Matsuda2016-12-191-2/+0
* | | | | | Merge pull request #27401 from kamipo/consolidate_duplicated_elsif_branchMatthew Draper2016-12-191-6/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Consolidate duplicated elsif branchRyuta Kamizono2016-12-191-6/+1
|/ / / / /
* | | | | fields: support attributes not on model.Kasper Timm Hansen2016-12-182-0/+37
* | | | | [ci skip] fields don't output ids by default anymore.Kasper Timm Hansen2016-12-181-2/+2
* | | | | form_with: allow methods outside the model.Kasper Timm Hansen2016-12-183-16/+96
* | | | | [ci skip] Replace remote with local in form_with doc.Kasper Timm Hansen2016-12-181-1/+1
* | | | | Make attributes output in html opt-in.Kasper Timm Hansen2016-12-181-1/+1
* | | | | Merge pull request #27396 from bianjp/fix-kindlerbXavier Noria2016-12-184-13/+10
|\ \ \ \ \
| * | | | | Fix rake guides:generate:kindle errorBian Jiaping2016-12-184-13/+10
|/ / / / /
* | | | | Merge pull request #27366 from utilum/avoid_fixnum_warningMatthew Draper2016-12-181-1/+1
|\ \ \ \ \
| * | | | | Fix Fixnum deprecated warning in Ruby 2.4+utilum2016-12-161-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #27329 from kamipo/simplify_unsigned_regexEileen M. Uchitelle2016-12-172-3/+2
|\ \ \ \ \
| * | | | | Simplify the regex for `unsigned?` methodRyuta Kamizono2016-12-112-3/+2
* | | | | | Merge pull request #27339 from utilum/puts_adapterEileen M. Uchitelle2016-12-171-0/+1
|\ \ \ \ \ \
| * | | | | | Output adapter being tested.utilum2016-12-121-0/+1
* | | | | | | How to disable scaffolds.scss in generators.md (#27383)Eike Send2016-12-171-1/+9
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #27393 from elpic/masterप्रथमेश Sonpatki2016-12-171-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add missing option on numbers helperPablo Ifran2016-12-171-0/+6
|/ / / / /
* | | | | Merge pull request #27387 from MSP-Greg/masterRafael França2016-12-164-8/+8
|\ \ \ \ \
| * | | | | Change ActiveModel::Type::Helpers to :nodoc: [ci skip]MSP-Greg2016-12-164-8/+8
* | | | | | Merge pull request #27386 from kevinhughes27/add-generator-command-line-arg-docsRafael França2016-12-161-0/+20
|\ \ \ \ \ \
| * | | | | | [ci skip] add a section explaining command line arguments for generatorsKevin Hughes2016-12-161-0/+20
* | | | | | | Merge pull request #27375 from kirs/fixture-error-messageRafael França2016-12-163-4/+20
|\ \ \ \ \ \ \
| * | | | | | | Throw friendly error message when fixture is not a hashKir Shatrov2016-12-153-4/+20