Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #27412 from maclover7/jm-ruby-24 | Kasper Timm Hansen | 2016-12-20 | 3 | -5/+6 |
|\ | |||||
| * | Add Ruby v2.4.0-rc1 to Travis matrix | Jon Moss | 2016-12-20 | 1 | -0/+1 |
| * | Limit length of secret being passed | Jon Moss | 2016-12-20 | 1 | -3/+3 |
| * | Bump concurrent-ruby and sprockets | Jon Moss | 2016-12-20 | 1 | -2/+2 |
|/ | |||||
* | [ci skip] Update initialization guide samples. | Kasper Timm Hansen | 2016-12-20 | 1 | -81/+84 |
* | Merge pull request #27414 from matthewd/fix-xml-vs-html-assertion | Matthew Draper | 2016-12-21 | 1 | -12/+12 |
|\ | |||||
| * | Revise the "XML is not HTML" test | Matthew Draper | 2016-12-20 | 1 | -12/+12 |
* | | Merge pull request #27408 from matthewd/charset-fix | Matthew Draper | 2016-12-20 | 3 | -5/+14 |
|\ \ | |||||
| * | | Only default the response charset when it is first set | Matthew Draper | 2016-12-20 | 3 | -5/+14 |
| |/ | |||||
* | | Merge pull request #27146 from maclover7/jm-fix-27145 | Eileen M. Uchitelle | 2016-12-19 | 2 | -2/+10 |
|\ \ | |||||
| * | | Do not clear HTTP_COOKIES header after request | Jon Moss | 2016-12-11 | 2 | -2/+10 |
* | | | Merge pull request #27391 from y-yagi/make_work_test_tool_with_line_filter | Kasper Timm Hansen | 2016-12-19 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | make work bin/test scripts with line filter | yuuji.yaginuma | 2016-12-17 | 1 | -0/+3 |
* | | | | Merge pull request #27407 from cemonti/master | Eileen M. Uchitelle | 2016-12-19 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix typo in channel generator usage message | Carlos Eduardo Monti | 2016-12-19 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #27365 from baweaver/patch-1 | Eileen M. Uchitelle | 2016-12-19 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | Add note on defaults block option | Brandon Weaver | 2016-12-14 | 1 | -0/+8 |
* | | | | | Merge pull request #27388 from maclover7/jm-argv | Eileen M. Uchitelle | 2016-12-19 | 2 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | `ARGV.shift` before calling Rails generators | Jon Moss | 2016-12-17 | 2 | -0/+17 |
* | | | | | | Merge pull request #27400 from kamipo/remove_useless_test_supports_primary_key | Eileen M. Uchitelle | 2016-12-19 | 1 | -6/+0 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Remove useless `test_supports_primary_key` | Ryuta Kamizono | 2016-12-19 | 1 | -6/+0 |
* | | | | | | `protected` here doesn't protect anything | Akira Matsuda | 2016-12-19 | 1 | -2/+0 |
* | | | | | | Merge pull request #27401 from kamipo/consolidate_duplicated_elsif_branch | Matthew Draper | 2016-12-19 | 1 | -6/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Consolidate duplicated elsif branch | Ryuta Kamizono | 2016-12-19 | 1 | -6/+1 |
|/ / / / / | |||||
* | | | | | fields: support attributes not on model. | Kasper Timm Hansen | 2016-12-18 | 2 | -0/+37 |
* | | | | | [ci skip] fields don't output ids by default anymore. | Kasper Timm Hansen | 2016-12-18 | 1 | -2/+2 |
* | | | | | form_with: allow methods outside the model. | Kasper Timm Hansen | 2016-12-18 | 3 | -16/+96 |
* | | | | | [ci skip] Replace remote with local in form_with doc. | Kasper Timm Hansen | 2016-12-18 | 1 | -1/+1 |
* | | | | | Make attributes output in html opt-in. | Kasper Timm Hansen | 2016-12-18 | 1 | -1/+1 |
* | | | | | Merge pull request #27396 from bianjp/fix-kindlerb | Xavier Noria | 2016-12-18 | 4 | -13/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Fix rake guides:generate:kindle error | Bian Jiaping | 2016-12-18 | 4 | -13/+10 |
|/ / / / / | |||||
* | | | | | Merge pull request #27366 from utilum/avoid_fixnum_warning | Matthew Draper | 2016-12-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Fixnum deprecated warning in Ruby 2.4+ | utilum | 2016-12-16 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #27329 from kamipo/simplify_unsigned_regex | Eileen M. Uchitelle | 2016-12-17 | 2 | -3/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Simplify the regex for `unsigned?` method | Ryuta Kamizono | 2016-12-11 | 2 | -3/+2 |
* | | | | | | Merge pull request #27339 from utilum/puts_adapter | Eileen M. Uchitelle | 2016-12-17 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Output adapter being tested. | utilum | 2016-12-12 | 1 | -0/+1 |
* | | | | | | | How to disable scaffolds.scss in generators.md (#27383) | Eike Send | 2016-12-17 | 1 | -1/+9 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #27393 from elpic/master | प्रथमेश Sonpatki | 2016-12-17 | 1 | -0/+6 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Add missing option on numbers helper | Pablo Ifran | 2016-12-17 | 1 | -0/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #27387 from MSP-Greg/master | Rafael França | 2016-12-16 | 4 | -8/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Change ActiveModel::Type::Helpers to :nodoc: [ci skip] | MSP-Greg | 2016-12-16 | 4 | -8/+8 |
* | | | | | | Merge pull request #27386 from kevinhughes27/add-generator-command-line-arg-docs | Rafael França | 2016-12-16 | 1 | -0/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ci skip] add a section explaining command line arguments for generators | Kevin Hughes | 2016-12-16 | 1 | -0/+20 |
* | | | | | | | Merge pull request #27375 from kirs/fixture-error-message | Rafael França | 2016-12-16 | 3 | -4/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Throw friendly error message when fixture is not a hash | Kir Shatrov | 2016-12-15 | 3 | -4/+20 |
* | | | | | | | | Bump coffee-script-source to fix bug | eileencodes | 2016-12-16 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-12-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove mention of SafeErb gem [ci skip] | Prathamesh Sonpatki | 2016-11-19 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #27368 from matthewd/doubled-callbacks | Matthew Draper | 2016-12-16 | 2 | -18/+77 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | |