aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #34278 from ↵Gannon McGibbon2018-10-221-3/+2
|\ | | | | | | | | GeniusStorm/remove_dependent_destroy_from_belongs_to_doc Fix #33914 : Remove dependent: :destroy option from the belong_to example since there is a warning associated with the usage of dependent: :destroy along with belongs_to
| * [ci skip] Fix #33914Raghu Kamat2018-10-221-3/+2
|/ | | | | This commit removes the dependent: :destroy option from the belong_to example since there is a warning associated with the usage of dependent: :destroy along with belongs_to. Based on the feedback on the issue #33914, I replaced dependent: :destroy with touch: :books_updated_at which will make the example consistent with the example that already exists on that page. * Also Removing the touch option from the belong_to scopes example as the option doesnt have any relation to association scope.
* Merge pull request #34241 from gmcgibbon/clarify_i18n_load_paths_gotchaRafael França2018-10-221-1/+3
|\ | | | | Clarify i18n load paths gotcha
| * [ci skip] Clarify load_paths behaviourGannon McGibbon2018-10-221-0/+2
| | | | | | | | | | | | | | Clarify `I18n.load_paths` vs `Rails.application.config.i18n.load_paths` behaviour. [Gannon McGibbon + Alberto Almagro Sotelo]
| * [ci skip] Remove explicit to_s for consistency with other exampleTrevor Wistaff2018-10-161-1/+1
| |
* | Merge pull request #34279 from ↵Ryuta Kamizono2018-10-221-1/+0
|\ \ | | | | | | | | | | | | bogdanvlviv/remove-extra-remove_file-skip_action_cable Remove extra call `remove_file` on `rails new` with `--skip_action_cable`
| * | Remove extra call `remove_file` on `rails new` with `--skip_action_cable`bogdanvlviv2018-10-221-1/+0
| | | | | | | | | | | | | | | There is no need to remove this file since the line below removes entire directory in which that file is placed.
* | | Merge pull request #34273 from albertoalmagro/improve-event-variable-namingEileen M. Uchitelle2018-10-221-4/+4
|\ \ \ | | | | | | | | Rename event variable
| * | | Rename event variableAlberto Almagro2018-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve variable naming by renaming from `e` to `event`. The arguments to rename this are: * The naming `e` is usually a convention used for exceptions. * No other method in this class uses the naming `e`. All other methods are using `event`.
* | | | Merge pull request #34274 from ↵Ryuta Kamizono2018-10-223-17/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | bogdanvlviv/remove-yarn-files-from-gitignore-template Remove yarn's files from `.gitignore` template
| * | | Add `/yarn-error.log` to `.gitignore`bogdanvlviv2018-10-211-1/+2
| | | |
| * | | Remove yarn's files from `.gitignore` template for new rails appbogdanvlviv2018-10-212-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webpacker already does it, see https://github.com/rails/webpacker/blob/895d2cfc15eda2edae9e667c642a02523d958f53/lib/install/template.rb#L25-L33 I also opened PR https://github.com/rails/webpacker/pull/1765 in order to make it add `/yarn-error.log` file too.
* | | | Merge pull request #34277 from ↵Ryuta Kamizono2018-10-222-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bogdanvlviv/remove-javascripts-javascripts_engine-options-for-generators Remove `javascripts` and `javascript_engine` options for generators
| * | | | Remove `javascripts` and `javascript_engine` options for generatorsbogdanvlviv2018-10-222-4/+0
| |/ / / | | | | | | | | | | | | It is unused since #33079
* | | | Merge pull request #34276 from ↵Ryuta Kamizono2018-10-221-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | bogdanvlviv/remove-javascript-option-from-the-plugin-constant Remove `:javascript` from `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`
| * | | Remove `:javascript` from `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`bogdanvlviv2018-10-221-1/+1
|/ / / | | | | | | | | | `--javascript` option was removed by 42198064c35ff3b701496309f90df2abc229efbe
* | | Correct some tests related to changes in #33079 (#34272)Bogdan2018-10-222-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix assertions of auto-generated ActiveStorage JS Since #33079 * Correct message on the `assert_equal` failure Related to #33079 * Test ActionCable's js files This commit adds `app/javascript/channels/consumer.js`, and `app/javascript/channels/index.js` to `DEFAULT_APP_FILES` in order to assert their existance in `test_skeleton_is_created`. Related to #33079 * Assert no match `javascript_pack_tag` in `application.html.erb` Since #33079 `rails new` generates `application.html.erb` file with `javascript_pack_tag` instead of `javascript_include_tag`. Note that there some tests that asserting no matching `javascript_include_tag` in the `application.html.erb` file for newly generated rails plugins. It is related to #34009 and shouldn't be changed right now.
* | | Merge pull request #34270 from eugeneius/read_write_attribute_allocationsRyuta Kamizono2018-10-222-8/+6
|\ \ \ | |/ / |/| | Reduce string allocations in read/write_attribute
| * | Reduce string allocations in read/write_attributeEugene Kenny2018-10-212-8/+6
|/ / | | | | | | | | | | | | | | | | When `attr_name` is passed as a symbol, it's currently converted to a string by `attribute_alias?`, and potentially also `attribute_alias`, as well as by the `read_attribute`/`write_attribute` method itself. By converting `attr_name` to a string up front, the extra allocations related to attribute aliases can be avoided.
* | Merge pull request #34219 from wilddima/datetime-exception-messageRyuta Kamizono2018-10-212-3/+14
|\ \ | | | | | | Add message to exception in datetime type
| * | Add new exception message to datetime from hash castwilddima2018-10-212-3/+14
| | |
* | | Use String#truncate_bytes inside Multibyte::Chars#limitFrancesco Rodríguez2018-10-202-31/+1
| | |
* | | Merge pull request #34265 from olivierlacan/flexbox-guides-indexJeremy Daer2018-10-205-37/+73
|\ \ \ | | | | | | | | Improve layout of Rails Guides index
| * | | Replace outdated Rails Guides logoOlivier Lacan2018-10-193-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version wasn’t matching the Rails Guides logo source file listed at https://github.com/rails/homepage/blob/master/materials/rails_guides_logo.psd somehow. It was also a GIF when an 8-bit PNG results in a smaller file (2KB vs 4KB) which should be just as widely compatible with browsers. And that’s just for the 1x version. I added a new 2x version for “retina” or high-density displays and a CSS @media query to progressively enhance with this high density version of the logo. I’ve ensured that this query is supported across browsers by using vendor-specific versions when necessary. See: https://caniuse.com/#feat=css-media-resolution [ci skip]
| * | | Shorten unnecessarily long names for GuidesOlivier Lacan2018-10-191-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The names are only used in the Guides Index overlay and several of them are longer than they need to be. For example “Ruby on Rails” is mentioned over and over again in the Release Notes section although these are obviously all Rails versions we’re listing. There’s a Maintenance Policy category with a Maintenance Policy article which is redundant. Policies makes much more sense as a category. Similarly, Contributing to Ruby on Rails is both a category and an article. “Contributions” is a better category title. “Ruby on Rails Guides Guidelines” is a gigantic mouthful. We are *in* the Rails Guides, we don’t need to specify what guides we’re talking about here. As a final added advantage, all of these shortenings make the index much easier to parse in order to find an article. [ci skip]
| * | | Use CSS flexbox for Guides index menuOlivier Lacan2018-10-192-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This notably allows us to tile each category without pushing the page down vertically as much as we previously did on any viewport wider than mobile sizes. It also means we can fit more guides which will become useful in the future since we have several new guides in the work. Finally the new layout allows three clearly distinct columns to emerge: - Start Here and Rails basics: Models, Views, Controllers, Other Components - Digging Deeper, Extending Rails, Contributing, Maintenance - Release Notes Having Release Notes shoot back up to the top of the third column is great because that makes finding the latest released version and its associated release notes much easier without having to scroll down a bunch. [ci skip]
* | | | Consistently use kwargs for `instance_{reader,writer,accessor}` optionsRyuta Kamizono2018-10-202-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #29294, `mattr_acessor` uses kwargs for `instance_reader`, `instance_writer`, and `instance_accessor` options. `thread_mattr_accessor` and `config_accessor` also take the same options, so let's maintain these options handles the same.
* | | | Merge pull request #34260 from frodsan/fix/remove-unnecessary-escape-charRyuta Kamizono2018-10-202-4/+4
|\ \ \ \ | | | | | | | | | | Remove unnecessary escape character
| * | | | Remove unnecessary escape characterFrancesco Rodríguez2018-10-192-4/+4
| | | | |
* | | | | Missing require "active_support/number_helper/number_converter"Akira Matsuda2018-10-207-0/+14
| | | | |
* | | | | Missing require "concurrent/hash"Akira Matsuda2018-10-201-0/+1
| | | | |
* | | | | Missing require "active_support/callbacks"Akira Matsuda2018-10-201-0/+2
| | | | |
* | | | | ActiveSupport module may not always already defined hereAkira Matsuda2018-10-202-150/+154
| | | | | | | | | | | | | | | | | | | | `ruby -ractive_support/core_ext/range/conversions.rb -ep` dies with uninitialized constant ActiveSupport
* | | | | Missing require "active_support/dependencies/autoload"Akira Matsuda2018-10-201-0/+2
| | | | |
* | | | | attribute_accessors no longer uses extract_options since ↵Akira Matsuda2018-10-201-2/+0
| | | | | | | | | | | | | | | | | | | | a5b0c60714e1e8d8c182af830a26e1c7c884271d
* | | | | Avoid running `webpacker:install` on tests that don't need ityuuji.yaginuma2018-10-202-6/+10
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If use `run_generator` to run the generator, `--skip-webpack-install` is specified automatically. https://github.com/rails/rails/blob/3101a4136bd62787e252d2658eee23001036fa0f/railties/lib/rails/generators/testing/behaviour.rb#L71 However, when executing the generator independently (for example, to use stub), `webpacker:install` was executed. Since this includes `yarn install`, it should be avoided in unnecessary testing.
* | | | Merge pull request #34257 from olivierlacan/verbose-query-logs-guidesRichard Schneeman2018-10-191-6/+43
|\ \ \ \ | |_|/ / |/| | | Add guides section on verbose query logs to Debugging
| * | | Add guides section on verbose query logs to DebuggingOlivier Lacan2018-10-191-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is a useful tool in debugging it made sense to document its existence and usage, especially in the console where it's disabled by default. [ci skip]
* | | | Avoid running bundler on tests that don't need ityuuji.yaginuma2018-10-191-3/+3
| |/ / |/| | | | | | | | | | | If the dev option is specified, Gemfile contains gem which specifies GitHub. This will take time to execute, so should avoid it in unnecessary tests.
* | | Merge pull request #34256 from y-yagi/make_aj_integration_tests_work_on_ci_2Yuji Yaginuma2018-10-195-18/+30
|\ \ \ | | | | | | | | Make AJ integration tests work in CI
| * | | Remove an extra `@mutex.synchronize`yuuji.yaginuma2018-10-191-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `@mutex.synchronize` is enforced in the `ensure_connection!` method, there is no need to do so on the caller side. https://github.com/jondot/sneakers/blob/c1b47f9c5d5a95da728bbe1700795790e4efbb12/lib/sneakers/publisher.rb#L22-L26 Due to this, `ThreadError(deadlock; recursive locking)` has occurred.
| * | | Replace port number 5433 to 5432 which tests expectyuuji.yaginuma2018-10-191-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | Also, replace the authentication setting. This is necessary for using `psql` with PostgreSQL 10. Ref: https://github.com/travis-ci/travis-ci/issues/9624#issuecomment-389537036
| * | | Return a non zero code when can not connect to backend on CIyuuji.yaginuma2018-10-194-4/+8
| |/ /
* | | Merge pull request #34249 from anthonygharvey/fix_testing_guide_typoYuji Yaginuma2018-10-191-1/+1
|\ \ \ | |/ / |/| | Fix typo in testing guide
| * | Fix typo in testing guideanthonygharvey2018-10-171-1/+1
| | |
* | | Deprecate Unicode's #pack_graphemes and #unpack_graphemes methodsFrancesco Rodríguez2018-10-183-4/+21
| | | | | | | | | | | | in favor of `array.flatten.pack("U*")` and `string.scan(/\X/).map(&:codepoints)`, respectively.
* | | Merge pull request #34243 from deivid-rodriguez/fix_generated_gemfile_on_jrubyYuji Yaginuma2018-10-181-1/+1
|\ \ \ | |/ / |/| | Fix generated Gemfile missing gems on jruby
| * | Fix generated Gemfile missing gems on jrubyDavid Rodríguez2018-10-171-1/+1
| | |
* | | Don't expose internal `get_value`/`set_value` methodsRyuta Kamizono2018-10-182-11/+9
|/ /
* | Merge pull request #34197 from schneems/schneems/symbol-hash-respond_toRichard Schneeman2018-10-173-12/+11
|\ \ | | | | | | ActiveRecord#respond_to? No longer allocates strings