aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26469 from y-yagi/remove_useless_optionRafael França2016-09-141-5/+0
|\ | | | | remove useless `gemfile` option
| * remove useless `gemfile` optionyuuji.yaginuma2016-09-121-5/+0
| | | | | | | | | | | | | | Rails application for test creates with `--skip-gemfile` option. https://github.com/rails/rails/blob/master/railties/test/isolation/abstract_unit.rb#L333 Therefore, regardless of the option, Gemfile is not created.
* | Merge pull request #26487 from prathamesh-sonpatki/move-preload-section-upRichard Schneeman2016-09-141-7/+8
|\ \ | | | | | | Move comment about disconnecting pool close to comment about preload
| * | Move comment about disconnecting pool close to comment about preloadPrathamesh Sonpatki2016-09-141-7/+8
| | | | | | | | | | | | - These two comments are connected to each other so kept them back to back.
* | | fix broken generators testyuuji.yaginuma2016-09-142-2/+2
|/ / | | | | | | Follow up to 92703a9ea5d8b96f30e0b706b801c9185ef14f0e
* | Do not point to the 5-0-stable branchRafael Mendonça França2016-09-131-1/+1
| | | | | | | | Master based applications should be pointing to master
* | Merge pull request #26314 from frodsan/puma-ar-disconnectRichard Schneeman2016-09-131-0/+8
|\ \ | | | | | | Disconnects all connections in the pool before forking.
| * | Disconnects all connections in the pool before forking.Francesco Rodriguez2016-08-291-0/+8
| | | | | | | | | | | | See discussion in https://github.com/puma/puma/issues/1001
* | | [ci skip] Update Levenshtein code with better attribution.Kasper Timm Hansen2016-09-121-1/+3
| |/ |/| | | | | Lacks some proper creds to the homies who went the... distance ;)
* | use correct Gemfile in `bin/setup` testyuuji.yaginuma2016-09-111-0/+18
| | | | | | | | | | | | | | Currently, `bin/setup` test uses Gemfile of Rails. But this Gemfile is not a file to be used in Rails application. Add a Gemfile to Rails application that is created for test, it has been modified to use the Gemfile.
* | Remove the word "mongrel" from documentsRyunosuke Sato2016-09-071-1/+1
| | | | | | | | | | | | | | | | | | Currently mongrel is not maintained. And it couldn't be built with any Ruby versions that supported by Rails. It is reasonable to remove the word "mongrel" in order to avoid confusion from newcomer.
* | Fix Remaining Case-In-Assignment Statement FormattingAlex Kitchens2016-09-061-7/+8
| | | | | | | | | | | | | | | | | | Recently, the Rails team made an effort to keep the source code consistent, using Ruboco (bb1ecdcc677bf6e68e0252505509c089619b5b90 and below). Some of the case statements were missed. This changes the case statements' formatting and is consistent with changes in 810dff7c9fa9b2a38eb1560ce0378d760529ee6b and db63406cb007ab3756d2a96d2e0b5d4e777f8231.
* | Allow download of email attachments in the Mailer Preview template.jpd8002016-09-021-1/+4
| |
* | fixes remaining RuboCop issues [Vipul A M, Xavier Noria]Xavier Noria2016-09-013-11/+11
| |
* | Fix styleschneems2016-08-301-26/+26
| |
* | Address comment via @dhh, better option namingschneems2016-08-301-4/+4
| |
* | Set unknown_asset_fallback false only new appsschneems2016-08-291-1/+1
| |
* | Move default to different initializerschneems2016-08-292-4/+4
| | | | | | | | | | Is this usage correct? cc/ @prathamesh-sonpatki
* | Thanks rubocopschneems2016-08-291-1/+1
| |
* | Fix initializerschneems2016-08-291-1/+1
| |
* | Default assets.unknown_asset_fallback to falseschneems2016-08-291-0/+4
| |
* | Favor `public_folder: true` over `public_*`schneems2016-08-291-25/+44
| | | | | | | | Adding all those `public_*` methods is a bit heavy handed, we can change the API to instead use `public_folder: true`. Change was pretty easy since it was already implemented that way.
* | Fix formattingschneems2016-08-291-3/+3
| |
* | Add `public_*` helpers to all the `_tag` methods.schneems2016-08-291-9/+15
| |
* | Test `public_` methods.schneems2016-08-291-0/+72
|/
* Merge pull request #26224 from jonatack/consistent-asset-precompile-examplesEileen M. Uchitelle2016-08-191-2/+3
|\ | | | | Consistent examples and template for assets#precompile
| * Consistent examples and template for assets#precompileJon Atack2016-08-191-2/+3
| | | | | | | | | | | | | | | | Listening to a few developers today discussing their troubles in understanding how to use the asset pipeline, it turns out that the precompile examples in the guides and assets.rb template have over time become a bit inconsistent. This PR makes the examples consistent in code style, spacing, and asset names, removes the old 'swfObject.js' example, and in a couple of places wraps lines at 80 characters including in the assets.rb template. Re-add spaces inside array parentheses.
* | run `before_configuration` callbacks as soon as application constant ↵yuuji.yaginuma2016-08-193-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | inherits from Rails::Application Until Rails 4.1, `before_configuration` run as soon as the application constant inherits from `Rails::Application`. However, in d25fe31c40928712b5e08fe0afb567c3bc88eddf, it has been modified to run at instantiation process. This modify to `before_configuration` is run at same timing as to Rails 4.1. Fixes #19880
* | refactor `CommandsTasks`yuuji.yaginuma2016-08-174-164/+132
| | | | | | | | | | Extract a common method of `Rails::CommandsTasks` and `Rails::Engine::CommandsTasks` to the module.
* | Merge pull request #26157 from ↵Rafael França2016-08-162-0/+2
|\ \ | | | | | | | | | | | | y-yagi/remove_test_mailers_when_skipping_action-mailer remove "test/mailers" directory when skipping action-mailer
| * | remove "test/mailers" directory when skipping action-maileryuuji.yaginuma2016-08-142-0/+2
| |/ | | | | | | Related to #26146
* | Merge pull request #26130 from yui-knk/drop_tableRafael França2016-08-161-1/+3
|\ \ | | | | | | Drop a temporary table before end of a test case
| * | Drop a temporary table before end of a test caseyui-knk2016-08-141-1/+3
| | |
* | | Add three new rubocop rulesRafael Mendonça França2016-08-1637-108/+108
| |/ |/| | | | | | | | | | | | | Style/SpaceBeforeBlockBraces Style/SpaceInsideBlockBraces Style/SpaceInsideHashLiteralBraces Fix all violations in the repository.
* | Ensure app/mailers is removed when skipping action-mailerBrian Cardarella2016-08-122-0/+2
| | | | | | | | Closes #26145
* | Make cache max-age durations self-explanatoryNathan Long2016-08-122-2/+2
|/
* Integration test to prevent regression for the 5th timeAaron Patterson2016-08-111-0/+47
| | | | | | | | Fix unsafe query generation risk. Redo of CVE-2012-2660, CVE-2012-2694 and CVE-2013-0155 CVE-2016-6317
* add missing require rakeyuuji.yaginuma2016-08-112-0/+26
| | | | | In ff8035dfeed8c86594c32ef8e9204806e190cb58, require rake is deferred. Therefore, it is necessary to require rake even `Engine::CommandsTasks.
* Fix broken alignments caused by auto-correct commit 411ccbdRyuta Kamizono2016-08-101-1/+2
| | | | Hash syntax auto-correcting breaks alignments. 411ccbdab2608c62aabdb320d52cb02d446bb39c
* code gardening: removes redundant selfsXavier Noria2016-08-0813-19/+19
| | | | | | | | | A few have been left for aesthetic reasons, but have made a pass and removed most of them. Note that if the method `foo` returns an array, `foo << 1` is a regular push, nothing to do with assignments, so no self required.
* revises most Lint/EndAlignment offensesXavier Noria2016-08-073-9/+10
| | | | Some case expressions remain, need to think about those ones.
* applies project convention for string literalsXavier Noria2016-08-071-1/+1
|
* Merge pull request #24260 from ↵Kasper Timm Hansen2016-08-072-5/+9
|\ | | | | | | | | y-yagi/show_error_message_when_error_raised_in_rails_runner show error message when error raised in rails runner
| * show error message when error raised in rails runneryuuji.yaginuma2016-08-032-5/+9
| |
* | Defer requiring Rake until it's needed.Kasper Timm Hansen2016-08-071-1/+8
| | | | | | | | | | | | | | | | Eagerly requiring Rake could put 100ms on to the Rails boot time. Shimmy that down to 0 by requiring Rake when no native Rails command exists and we try to run a Rake task. Or when printing all the Rake commands through `rails help`. Fixes #25029
* | Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty linesRyuta Kamizono2016-08-076-8/+0
| |
* | Merge pull request #26060 from siong1987/minor/puma-configGuillermo Iguaran2016-08-061-1/+1
|\ \ | | | | | | .to_i is unnecessary for puma threads.
| * | .to_i is unnecessary.Teng Siong Ong2016-08-041-1/+1
| |/
* | applies remaining conventions across the projectXavier Noria2016-08-0620-46/+29
| |
* | normalizes indentation and whitespace across the projectXavier Noria2016-08-0637-417/+417
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 18:16:44 +0000