aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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`
| * | | | Avoid invalid attribute on local forms generated by `form_with`George Claghorn2016-12-152-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes that the following ERB template would result in invalid HTML output: <%= form_with model: Post.new, local: true do |form| %> <% end %> Specifically, the resulting form tag would have a spurious `remote` attribute: <form remote="false" ...>
* | | | | 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].
| * | | | 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 conflicts
| * | | | | Fix constantize edge case involving prepend, autoloading and name conflictsJean Boussier2016-12-144-1/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the following situation: ```ruby class Bar end module Baz end class Foo prepend Baz end class Foo::Bar end ``` Running `Inflector.constantize('Foo::Bar')` would blow up with a NameError. What is happening is that `constatize` was written before the introduction of prepend, and wrongly assume that `klass.ancestors.first == klass`. So it uses `klass.ancestors.inject` without arguments, as a result a prepended module is used in place of the actual class.
* | | | | Merge pull request #27353 from mtsmfm/remove-unused-methodEileen M. Uchitelle2016-12-141-4/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused method `namespaced_file_path`
| * | | | Remove unused method `namespaced_file_path`Fumiaki MATSUSHIMA2016-12-141-4/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` $ git grep namespaced_file_path railties/lib/rails/generators/named_base.rb: def namespaced_file_path railties/lib/rails/generators/named_base.rb: @namespaced_file_path ||= namespaced_class_path.join("/") ```
* | | | Merge pull request #27350 from y-yagi/use_appropriate_type_for_rc_optionKasper Timm Hansen2016-12-141-1/+1
|\ \ \ \ | | | | | | | | | | use appropriate type for `rc` option
| * | | | use appropriate type for `rc` optionyuuji.yaginuma2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning. ``` Expected boolean default value for '--rc'; got "~/.railsrc" (string) ```
* | | | | 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.4
| * | | | fix new warning in ruby 2.4yuuji.yaginuma2016-12-142-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning. ``` test/caching_test.rb:986: warning: parentheses after method name is interpreted as test/caching_test.rb:986: warning: an argument list, not a decomposed argument test/cases/adapters/mysql2/reserved_word_test.rb:146: warning: parentheses after method name is interpreted as test/cases/adapters/mysql2/reserved_word_test.rb:146: warning: an argument list, not a decomposed argument ``` Ref: https://github.com/ruby/ruby/commit/65e27c8b138d6959608658ffce2fa761842b8d24
* | | | form_with/fields: Don't output ids by defaultKasper Timm Hansen2016-12-134-206/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continuing 67f81cc where we decided not to output ids by default in the new form helpers. Went with @dhh's suggestion of just requiring ids on fields being labelled: https://github.com/rails/rails/issues/25197#issuecomment-231797117 Seems okay enough.
* | | | Add CHANGELOG entry to #27042Rafael Mendonça França2016-12-131-0/+4
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #27042 from kirs/yaml-schema-cacheRafael França2016-12-137-17/+435
|\ \ \ \ | | | | | | | | | | Schema cache in YAML
| * | | | 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+
| * | | | | change return value of `duplicable?` with Ruby 2.4+yuuji.yaginuma2016-12-133-35/+71
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `NilClass`, `FalseClass`, `TrueClass`, `Symbol` and `Numeric` can dup with Ruby 2.4+. Ref: https://bugs.ruby-lang.org/issues/12979
* | | | | Don't assign a default to `webpack`.Kasper Timm Hansen2016-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unintentionally makes `--webpack` implied on `rails new apper`. If passed `--webpack` Thor assigns `"webpack"` to `options[:webpack]`, so we can check for that instead of `"base"`.
* | | | | Add option to trigger JS framework-specific installation as part of webpack ↵David Heinemeier Hansson2016-12-122-2/+17
| | | | | | | | | | | | | | | | | | | | setup
* | | | | :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
| | | | | | | | | | | | | | | | | | | | https://bugs.ruby-lang.org/issues/12979
* | | | | Keep AS::XmlMini::PARSING["decimal"].call('') returning 0Akira Matsuda2016-12-131-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | BigDecimal('an invalid string') has changed its behavior to raise an ArgumentError since 1.3.0 https://bugs.ruby-lang.org/issues/10286
* | | | | Missing require "yaml"Akira Matsuda2016-12-121-0/+1
| | | | |
* | | | | Oops!Akira Matsuda2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | namespace_ladder can be nil here
* | | | | :nail_care:Akira Matsuda2016-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | Don't expect the caller of this method to know that the return value has an extra " "
* | | | | Merge pull request #27328 from kamipo/add_changelog_for_26687Eileen M. Uchitelle2016-12-111-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Add a changelog entry for #26687 [ci skip]
| * | | | | 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 line
| * | | | | 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]
| * | | | | 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 time
| * | | | Fix CI failure caused by #25227 and #25280 were merged at the same timeRyuta Kamizono2016-12-102-2/+2
|/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:12:33 +0000