aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | 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
* | | | | | | | | | | | Bump coffee-script-source to fix bugeileencodes2016-12-161-1/+1
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | 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
* | | | | | | | | | | | Merge pull request #27368 from matthewd/doubled-callbacksMatthew Draper2016-12-162-18/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Support double-yield inside an around callbackMatthew Draper2016-12-152-18/+77
* | | | | | | | | | | | Merge pull request #27341 from richardmonette/fix-querycache-nil-dupRafael França2016-12-155-5/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix QueryCache nil dupRichard Monette2016-12-155-5/+34
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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`George Claghorn2016-12-152-4/+10
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* / | | | | | | | | | | Add missing spaces to button_tag api doc [ci skip] (#27369)Andreas Maierhofer2016-12-151-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #27358 from utilum/27347Jon Moss2016-12-141-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mention JS Runtime dependency in dev dependencies guide [ci skip].utilum2016-12-141-0/+4
* | | | | | | | | | | | Merge pull request #27354 from Shopify/fix-constantize-and-prepended-modulesRafael França2016-12-144-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix constantize edge case involving prepend, autoloading and name conflictsJean Boussier2016-12-144-1/+16
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #27353 from mtsmfm/remove-unused-methodEileen M. Uchitelle2016-12-141-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove unused method `namespaced_file_path`Fumiaki MATSUSHIMA2016-12-141-4/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #27350 from y-yagi/use_appropriate_type_for_rc_optionKasper Timm Hansen2016-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use appropriate type for `rc` optionyuuji.yaginuma2016-12-141-1/+1
* | | | | | | | | | | | Missing require "active_support/testing/constant_lookup"Akira Matsuda2016-12-141-0/+1
* | | | | | | | | | | | Merge pull request #27349 from y-yagi/fix_ruby_warning_in_ruby_2_4Rafael França2016-12-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix new warning in ruby 2.4yuuji.yaginuma2016-12-142-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | form_with/fields: Don't output ids by defaultKasper Timm Hansen2016-12-134-206/+243
* | | | | | | | | | | Add CHANGELOG entry to #27042Rafael Mendonça França2016-12-131-0/+4
* | | | | | | | | | | Merge pull request #27042 from kirs/yaml-schema-cacheRafael França2016-12-137-17/+435
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use YAML to serialize schema cacheKir Shatrov2016-11-277-17/+435
* | | | | | | | | | | | Merge pull request #27293 from y-yagi/fix_duplicable_with_2_4Kasper Timm Hansen2016-12-133-35/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | change return value of `duplicable?` with Ruby 2.4+yuuji.yaginuma2016-12-133-35/+71
|/ / / / / / / / / / /
* | | | | | | | | | / Don't assign a default to `webpack`.Kasper Timm Hansen2016-12-121-2/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Add option to trigger JS framework-specific installation as part of webpack s...David Heinemeier Hansson2016-12-122-2/+17
* | | | | | | | | | :nail_care:Akira Matsuda2016-12-131-2/+1
* | | | | | | | | | nil, true, 1, etc. don't raise on #dup since Ruby 2.4Akira Matsuda2016-12-131-1/+1
* | | | | | | | | | Keep AS::XmlMini::PARSING["decimal"].call('') returning 0Akira Matsuda2016-12-131-1/+11
* | | | | | | | | | Missing require "yaml"Akira Matsuda2016-12-121-0/+1
* | | | | | | | | | Oops!Akira Matsuda2016-12-121-1/+1
* | | | | | | | | | :nail_care:Akira Matsuda2016-12-121-2/+2
* | | | | | | | | | Merge pull request #27328 from kamipo/add_changelog_for_26687Eileen M. Uchitelle2016-12-111-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Add a changelog entry for #26687 [ci skip]Ryuta Kamizono2016-12-121-0/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #27330 from kamipo/remove_duplicated_lineGuillermo Iguaran2016-12-111-1/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove duplicated lineRyuta Kamizono2016-12-111-1/+0
|/ / / / / / / /