aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Update initialization guide samples.Kasper Timm Hansen2016-12-201-81/+84
| | | | Rewrite bits and pieces to mention the command infrastructure.
* Merge pull request #27414 from matthewd/fix-xml-vs-html-assertionMatthew Draper2016-12-211-12/+12
|\ | | | | Revise the "XML is not HTML" test
| * Revise the "XML is not HTML" testMatthew Draper2016-12-201-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-fixMatthew Draper2016-12-203-5/+14
|\ \ | | | | | | Only default the response charset when it is first set
| * | Only default the response charset when it is first setMatthew Draper2016-12-203-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-27145Eileen M. Uchitelle2016-12-192-2/+10
|\ \ | | | | | | Do not clear HTTP_COOKIES header after request
| * | 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 filter
| * | | make work bin/test scripts with line filteryuuji.yaginuma2016-12-171-0/+3
| | | | | | | | | | | | | | | | | | | | `Rails::LineFiltering` is not automatically loaded, need to load it explicitly. Ref: 797f1dd, b6f935b
* | | | Merge pull request #27407 from cemonti/masterEileen M. Uchitelle2016-12-191-2/+2
|\ \ \ \ | | | | | | | | | | Fix typo in channel generator usage message
| * | | | 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 option
| * | | | Add note on defaults block optionBrandon Weaver2016-12-141-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-argvEileen M. Uchitelle2016-12-192-0/+17
|\ \ \ \ \ | | | | | | | | | | | | `ARGV.shift` before calling Rails generators
| * | | | | `ARGV.shift` before calling Rails generatorsJon Moss2016-12-172-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_keyEileen M. Uchitelle2016-12-191-6/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove useless `test_supports_primary_key`
| * | | | | Remove useless `test_supports_primary_key`Ryuta Kamizono2016-12-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `supports_primary_key?` method is defined in `AbstractAdapter` so does not raise any errors.
* | | | | | `protected` here doesn't protect anythingAkira Matsuda2016-12-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | there aren't any instance method defined in this class
* | | | | | Merge pull request #27401 from kamipo/consolidate_duplicated_elsif_branchMatthew Draper2016-12-191-6/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Consolidate duplicated elsif branch
| * | | | | Consolidate duplicated elsif branchRyuta Kamizono2016-12-191-6/+1
|/ / / / /
* | | | | fields: support attributes not on model.Kasper Timm Hansen2016-12-182-0/+37
| | | | | | | | | | | | | | | | | | | | Ensure the support works like form_with.
* | | | | [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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Hansen2016-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | Remote is gone, long live local.
* | | | | Make attributes output in html opt-in.Kasper Timm Hansen2016-12-181-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-kindlerbXavier Noria2016-12-184-13/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix rake guides:generate:kindle error
| * | | | | 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+
| * | | | | 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?` method
| * | | | | Simplify the regex for `unsigned?` methodRyuta Kamizono2016-12-112-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is enough to distinguish only the trailing `unsigned` and `unsigned zerofill`.
* | | | | | Merge pull request #27339 from utilum/puts_adapterEileen M. Uchitelle2016-12-171-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve clarity of AJ tests output
| * | | | | | Output adapter being tested.utilum2016-12-121-0/+1
| | | | | | |
* | | | | | | How to disable scaffolds.scss in generators.md (#27383)Eike Send2016-12-171-1/+9
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * How to disable scaffolds.scss in generators.md * Improves workflow customization text in generators.md
* | | | | | Merge pull request #27393 from elpic/masterप्रथमेश Sonpatki2016-12-171-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Add missing option on number helper
| * | | | | Add missing option on numbers helperPablo Ifran2016-12-171-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | The `delimiter_pattern` option was not present on the documentaion of the helper.
* | | | | Merge pull request #27387 from MSP-Greg/masterRafael França2016-12-164-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Change ActiveModel::Type::Helpers to :nodoc: [ci skip]
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Docs Command Line Arguments for Generators
| * | | | | | [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 hash
| * | | | | | | Throw friendly error message when fixture is not a hashKir Shatrov2016-12-153-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, when fixture is not a Hash we throw an error message saying "fixture is not a hash". This is not very user friendly because it's not saying which fixture is invalid.
* | | | | | | | Bump coffee-script-source to fix bugeileencodes2016-12-161-1/+1
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coffee script 1.12.1 was released and contained a bug where coffee script was undefined. 1.12.1 was yanked and 1.12.2 was released. This bumps coffee-script-source so that CI Railties tests pass. See: https://github.com/jashkenas/coffeescript/issues/4403
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-12-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove mention of SafeErb gem [ci skip]Prathamesh Sonpatki2016-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup of https://github.com/rails/rails/pull/27086
* | | | | | | | Merge pull request #27368 from matthewd/doubled-callbacksMatthew Draper2016-12-162-18/+77
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Support double-yield inside an around callback
| * | | | | | | Support double-yield inside an around callbackMatthew Draper2016-12-152-18/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's questionable whether this is a good thing -- it forces any later/ inner callback to handle multiple invocations, along with the actual wrapped action. But it worked prior to 871ca21f6a1d65c0ec78cb5a9641411e2210460b, so we shouldn't break it unintentionally.
* | | | | | | | Merge pull request #27341 from richardmonette/fix-querycache-nil-dupRafael França2016-12-155-5/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix QueryCache nil dup
| * | | | | | | | fix QueryCache nil dupRichard Monette2016-12-155-5/+34
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sql statements frozen dup if arel is not our string expect runtime error dont wrap runtime error in invalid log errors will now be treated as runtime errors update changelog
* | | | | | | | Merge pull request #27367 from georgeclaghorn/local-form-withKasper Timm Hansen2016-12-152-4/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoid invalid attribute on local forms generated by `form_with`
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 13:00:54 +0000