aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Merge pull request #27323 from kamipo/add_changelog_for_25227Matthew Draper2016-12-111-0/+4
|\ \ \ \
| * | | | Add a changelog entry for #25227 [ci skip]Ryuta Kamizono2016-12-101-0/+4
* | | | | Merge pull request #27322 from kamipo/fix_ci_failureMatthew Draper2016-12-112-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix CI failure caused by #25227 and #25280 were merged at the same timeRyuta Kamizono2016-12-102-2/+2
|/ / / /
* | | | Merge pull request #25280 from kamipo/prevent_range_error_for_belongs_to_asso...Sean Griffin2016-12-102-0/+16
|\ \ \ \
| * | | | Prevent `RangeError` for `belongs_to` associationsRyuta Kamizono2016-10-102-0/+16
* | | | | Merge pull request #25227 from kamipo/numeric_value_out_of_rangeSean Griffin2016-12-107-8/+26
|\ \ \ \ \
| * | | | | Translate numeric value out of range to the specific exceptionRyuta Kamizono2016-12-067-8/+26
* | | | | | Merge pull request #27320 from y-yagi/run_webpack_command_only_when_webpack_o...Matthew Draper2016-12-101-1/+1
|\ \ \ \ \ \
| * | | | | | run `webpack` command only when webpack option is specifiedyuuji.yaginuma2016-12-101-1/+1
|/ / / / / /
* | | | | | gemfile entry method need to return an empty array rather than nil (#27318)Yuji Yaginuma2016-12-091-4/+4