| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | fix typo in getting_started [ci skip] (#27423) | yachibit | 2016-12-21 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #27355 from yukideluxe/fixtures-deleted-tables | Kasper Timm Hansen | 2016-12-21 | 6 | -3/+28 | |
| |\ | | | | | fix fixtures loading for models with same table names in different databases | |||||
| | * | fix #create_fixtures when equal table names in different databases | Julia Lopez | 2016-12-21 | 6 | -3/+28 | |
| |/ | ||||||
| * | Fix grammar in asset tag documentation | eileencodes | 2016-12-20 | 1 | -1/+1 | |
| | | | | | | Updated the docmentation because "options supports" is not grammatically correct. | |||||
| * | Improve `javascript_include_tag` documentation (#27403) | Pablo Ifrán | 2016-12-20 | 1 | -5/+24 | |
| | | | | | Add all the available options, and correct the samples of the `javascript_include_tag`. | |||||
| * | Merge pull request #27412 from maclover7/jm-ruby-24 | Kasper Timm Hansen | 2016-12-20 | 3 | -5/+6 | |
| |\ | | | | | Ruby 2.4 compatibility | |||||
| | * | 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 | |
| | | | | | | | | | Very similar to PR #25758, see more in depth reasoning there. | |||||
| | * | Bump concurrent-ruby and sprockets | Jon Moss | 2016-12-20 | 1 | -2/+2 | |
| |/ | | | | Bumped to Ruby 2.4 compatible versions | |||||
| * | [ci skip] Update initialization guide samples. | Kasper Timm Hansen | 2016-12-20 | 1 | -81/+84 | |
| | | | | | Rewrite bits and pieces to mention the command infrastructure. | |||||
| * | 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 | |||||
| | * | Revise the "XML is not HTML" test | Matthew Draper | 2016-12-20 | 1 | -12/+12 | |
| | | | | | | | | | | | | | It was depending on a side-effect of the old html-scanner, so was no longer proving what it intended to. Instead, assert more directly about the resulting observable difference. | |||||
| * | | 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 | |||||
| | * | | Only default the response charset when it is first set | Matthew Draper | 2016-12-20 | 3 | -5/+14 | |
| | |/ | | | | | | | | | If it is explicitly cleared (e.g., response.sending_file = true), then we should not try to set it again. | |||||
| * | | 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 | |||||
| | * | | 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 | |||||
| | * | | | make work bin/test scripts with line filter | yuuji.yaginuma | 2016-12-17 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | `Rails::LineFiltering` is not automatically loaded, need to load it explicitly. Ref: 797f1dd, b6f935b | |||||
| * | | | | Merge pull request #27407 from cemonti/master | Eileen M. Uchitelle | 2016-12-19 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Fix typo in channel generator usage message | |||||
| | * | | | | 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 | |||||
| | * | | | | Add note on defaults block option | Brandon Weaver | 2016-12-14 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | When I was looking for how to default the entire routes file to JSON I could only find the postfix option. It was mentioned on IRC that you could do this with a block as well and I had not found it in the documentation. | |||||
| * | | | | | Merge pull request #27388 from maclover7/jm-argv | Eileen M. Uchitelle | 2016-12-19 | 2 | -0/+17 | |
| |\ \ \ \ \ | | | | | | | | | | | | | `ARGV.shift` before calling Rails generators | |||||
| | * | | | | | `ARGV.shift` before calling Rails generators | Jon Moss | 2016-12-17 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gems like rspec-rails depend on `ARGV` being shifted, and `scaffold` (for example) not being the first item in `ARGV`. This should allow rspec-rails to be passing on Rails master. | |||||
| * | | | | | | 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` | |||||
| | * | | | | | Remove useless `test_supports_primary_key` | Ryuta Kamizono | 2016-12-19 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `supports_primary_key?` method is defined in `AbstractAdapter` so does not raise any errors. | |||||
| * | | | | | | `protected` here doesn't protect anything | Akira Matsuda | 2016-12-19 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | there aren't any instance method defined in this class | |||||
| * | | | | | | Merge pull request #27401 from kamipo/consolidate_duplicated_elsif_branch | Matthew Draper | 2016-12-19 | 1 | -6/+1 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Consolidate duplicated elsif branch | |||||
| | * | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | Ensure the support works like form_with. | |||||
| * | | | | | [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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has the handy effect of making the initial examples in the form_with docs work too. Had to do some finagling such that form_with's without a scope didn't wrap their names in braces ala `[title]`. | |||||
| * | | | | | [ci skip] Replace remote with local in form_with doc. | Kasper Timm Hansen | 2016-12-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Remote is gone, long live local. | |||||
| * | | | | | Make attributes output in html opt-in. | Kasper Timm Hansen | 2016-12-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using `except` any option provided to `form_with` would become an html attribute unless explicitly opted out. This proved annoying when adding new internal keys in the options hash and seeing them pop up in the html output. Prevent this by inverting the `except` to `slice` out the keys we want to allow becoming html attributes, like id and class. | |||||
| * | | | | | Merge pull request #27396 from bianjp/fix-kindlerb | Xavier Noria | 2016-12-18 | 4 | -13/+10 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix rake guides:generate:kindle error | |||||
| | * | | | | | 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+ | |||||
| | * | | | | | 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 | |||||
| | * | | | | | Simplify the regex for `unsigned?` method | Ryuta Kamizono | 2016-12-11 | 2 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is enough to distinguish only the trailing `unsigned` and `unsigned zerofill`. | |||||
| * | | | | | | Merge pull request #27339 from utilum/puts_adapter | Eileen M. Uchitelle | 2016-12-17 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve clarity of AJ tests output | |||||
| | * | | | | | | 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 | |
| | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * How to disable scaffolds.scss in generators.md * Improves workflow customization text in generators.md | |||||
| * | | | | | | Merge pull request #27393 from elpic/master | प्रथमेश Sonpatki | 2016-12-17 | 1 | -0/+6 | |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Add missing option on number helper | |||||
| | * | | | | | Add missing option on numbers helper | Pablo Ifran | 2016-12-17 | 1 | -0/+6 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | The `delimiter_pattern` option was not present on the documentaion of the helper. | |||||
| * | | | | | 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] | |||||
| | * | | | | | 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 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Docs Command Line Arguments for Generators | |||||
| | * | | | | | | [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 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |