aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29967 from naw/binstub-error-msgRichard Schneeman2017-08-031-5/+16
|\ | | | | Improve bundler binstub error message
| * Revise bundle binstub error messageNathan Wenneker2017-08-031-8/+13
| |
| * Improve bundler binstub error messageNathan Wenneker2017-07-261-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails displays an error message if you have a bundler-generated binstub at `./bin/rails` instead of a Rails-generated binstub. This error message is misleading because it makes it seem as though Rails 5 introduced recent changes in how binstubs are used, when these changes were actually introduced way back in Rails 4. The suggested upgrade steps are appropriate for an app that was created in Rails 3, but they likely aren't the correct fix for someone who sees this error message today on a modern app. I believe the `--binstubs` option on bundler is a more likely culprit and troubleshooting path.
* | Merge pull request #30011 from guilherme/fix-migration-generator-special-casesSean Griffin2017-08-031-0/+22
|\ \ | | | | | | Handling add/remove to/from migration edge cases
| * | Handling add/remove to/from migration edge casesGuilherme Reis Campos2017-08-031-0/+22
| | | | | | | | | | | | Making sure the table name is parsed correctly when an add/remove column migration have 'from'/'to' in the table name.
* | | Merge remote-tracking branch 'origin/master' into unlock-minitestRafael Mendonça França2017-08-0159-490/+827
|\ \ \
| * \ \ Merge pull request #30015 from larskanis/use-duktake-on-mingwGuillermo Iguaran2017-08-012-0/+4
| |\ \ \ | | | | | | | | | | Use duktape gem as default JS engine on Windows-MINGW
| | * | | Use duktape gem as default JS engine on Windows-MINGW and MS-Visual-C buildsLars Kanis2017-08-012-0/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fallback javascript engine on Windows is Windows Script Host (JScript). However this engine isn't able to process the default assets, because it supports ES3 only but the coffeescript compiler requires ES5. Fixes #30014
| * | | Merge pull request #30023 from y-yagi/remove_unnecessary_doc_directory_deletionGuillermo Iguaran2017-08-012-2/+0
| |\ \ \ | | | | | | | | | | Remove unnecessary `doc` directory deletion
| | * | | Remove unnecessary `doc` directory deletionyuuji.yaginuma2017-08-012-2/+0
| | | | | | | | | | | | | | | | | | | | Since 553b695, `doc` directory is not created in application.
| * | | | Merge pull request #30029 from yhirano55/fix_rails_command_commentsSean Griffin2017-08-011-3/+3
| |\ \ \ \ | | | | | | | | | | | | [ci skip] Fix rails_command comments
| | * | | | [ci skip] Fix rails_command commentsYoshiyuki Hirano2017-08-011-3/+3
| | | |_|/ | | |/| |
| * | | | Fix rubocop style issues in yarn and spring.rb templates"roberts10002017-07-312-3/+3
| | |/ / | |/| |
| * | | Set Ruby version in Gemfile and .ruby-version by defaultAlberto Almagro2017-07-315-0/+25
| | |/ | |/|
| * | Fix `warning: method redefined;`yuuji.yaginuma2017-07-281-3/+3
| |/ | | | | | | | | | | | | | | | | This fixes the following warning: ``` /tmp/d20170727-7039-kmdtb1/app/app/models/user.rb:5: warning: method redefined; discarding old model_name rails/activemodel/lib/active_model/naming.rb:222: warning: previous definition of model_name was here ```
| * Merge pull request #29926 from pawandubey:fix-test-with-absolute-pathsKasper Timm Hansen2017-07-252-1/+30
| |\
| | * Allow bin/rails test task to take absolute paths as argumentsPawan Dubey2017-07-252-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solves #29923 This regression was caused due to a wrong regex to filter out paths, introduced in commit 796a1cf0e The regex was /^\w+\// which did not accept paths with a leading slash and hence all absolute paths were filtered out. This change introduces a change in regex which allows for a leading slash and acts on the matched term accordingly. While cascading through the case block, the paths are checked for line number specification, existence of a directory at that path and if none of those match, then it is considered to be a path to the file. The regex matchers specified are filtered out via the call to `Array#compact` since they do not match any of these conditions.
| * | Merge pull request #29931 from ↵Sean Griffin2017-07-254-65/+36
| |\ \ | | |/ | |/| | | | | | | y-yagi/extract_assert_output_and_available_pty_to_module Extract `assert_output` and `available_pty?` into `ConsoleHelpers` module
| | * Extract `assert_output` and `available_pty?` into `ConsoleHelpers` moduleyuuji.yaginuma2017-07-254-65/+36
| | | | | | | | | | | | | | | We define almost the same method with multiple tests. Therefore, it extract into module.
| * | Fix `dbconsole` test when tempdir is a long pathSean Griffin2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The output of `.databases` in SQLite will truncate to a certain size. This causes the test to fail when run locally from a mac, or anything which has a tempdir with more than a few characters. This pragma has the same output, but presented as a normal query, meaning no truncation will occur.
| * | Merge pull request #29916 from lugray/stop_generating_application_recordEileen M. Uchitelle2017-07-256-34/+35
| |\ \ | | |/ | |/| Stop creating ApplicationRecord on model generation
| | * Stop creating ApplicationRecord on model generationLisa Ugray2017-07-246-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating models, we created ApplicationRecord in the default location if no file existed there. That was annoying for people who moved it to somewhere else in the autoload path. At this point, the vast majority of apps should have either run the upgrade script or generated a model since upgrading. For those that haven't the error message after generating a new model should be helpful: NameError: uninitialized constant ApplicationRecord To ease friction in that case, this also adds a generator for ApplicationRecord.
| * | Fix `warning: ambiguous first argument`yuuji.yaginuma2017-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning: ``` railties/test/application/rake/dbs_test.rb:265: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
| * | Merge pull request #29898 from ↵Rafael França2017-07-242-0/+38
| |\ \ | | |/ | |/| | | | | | | deivid-rodriguez/follow_up_to_multiple_location_engine_mounting Fix regression introduced by fixing mounting the same engine in multiple locations
| | * Fix regression from multiple mountpoint supportDavid Rodríguez2017-07-242-0/+38
| | |
| * | Merge pull request #29902 from y-yagi/fix_29880Rafael França2017-07-241-2/+6
| |\ \ | | | | | | | | Do not show URL in boot info when using Puma
| | * | Do not show URL in boot info when using Pumayuuji.yaginuma2017-07-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puma has its own configuration file(e.g. `config/puma.rb`). Can define a port and a URL to bind in the configuration file. Therefore, on Rails side, can not grasp which URI to bind finally. Because of that, it may show a URL different from the actually bound URL, so I think that it is better not to show it. Fixes #29880
| * | | Merge pull request #29853 from lugray/move_generator_namespacing_to_baseRafael França2017-07-242-36/+37
| |\ \ \ | | | | | | | | | | Move generator namespacing to Base
| | * | | Move generator namespacing to BaseLisa Ugray2017-07-192-36/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generators need to be aware of namespace to work properly in engines. Methods to help with this lived in Rails::Generators::NamedBase. Moving them to Rails::Generators::Base (which NamedBase inherits from) allows a follow-up in which a namespace aware unnamed generator can be created.
| * | | | Revert "Include rack-mini-profiler by default"Rafael França2017-07-242-7/+0
| | | | |
| * | | | Include rack-mini-profiler by defaultschneems2017-07-242-0/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've used many development related performance tools, but the single most consistently helpful tool is `rack-mini-profiler`. The tool provides a lightweight UI element for each page, that shows the server response time. When clicked it expands to show more detail: ![](https://www.dropbox.com/s/0aciw4mk8c059n0/Screenshot%202017-07-24%2010.24.24.png?dl=1) This can be used to detect expensive queries, N+1 issues and general performance related problems.
| * | | Avoid modifying frozen string in check_schema_fileEugene Kenny2017-07-231-0/+7
| | |/ | |/| | | | | | | | | | | | | This was missed when the frozen string literal pragma was added to this file because the string is only modified when running in the context of a full Rails app, which wasn't covered by the test suite.
| * | Fix false positive test related to wrong app root path.Wojciech Wnętrzak2017-07-211-11/+11
| | | | | | | | | | | | | | | | | | Without setting root config, `config.paths["config/secrets"]` located in https://github.com/rails/rails/blob/84eb498f84ebc5d1be0b0db6f7bca9da3d679ca6/railties/lib/rails/application.rb#L390 always returned empty list.
| * | Make `rails yarn:install` ignore dev dependenciesprintercu2017-07-191-1/+1
| |/
| * support `-` as an argument to `rails runner`Cody Cutrer2017-07-174-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | in Rails 4.0, you could use `/dev/stdin` on both Linux and Mac, but with the switch to Kernel.load in Rails 4.1, this broke on Linux (you get a LoadError). Instead, explicitly detect `-` as meaning stdin, then read from stdin explicitly, instead of performing file gymnastics. This should now work on any platform uniformly. Passing a script via stdin is useful when you're sshing to a server, and the script you want to run is stored locally. You could theoretically pass the entire script on the command line, but in reality you'll run into problems with the command being too long.
| * Rename helper to force_lazy_load_hooks.Kasper Timm Hansen2017-07-171-14/+14
| | | | | | | | | | | | Clarifies the intent that aren't just loading the model but really caring about triggering the on_load callbacks.
| * Add bootsnap to default Gemfile:Burke Libbey2017-07-173-0/+8
| | | | | | | | | | | | Bootsnap precomputes load path resolution and caches ruby ISeq and YAML parsing/compilation, reducing application boot time by approximately 50% on supported configurations.
| * Set `RAILS_ENV` before load application fileyuuji.yaginuma2017-07-172-4/+36
| | | | | | | | | | | | | | Since #29725, load application file when `dbconsole` command is executed. However, if do not set `RAILS_ENV` before reading the application file, can not connect to the env specified in option, so added the setting of `RAILS_ENV`.
| * Merge pull request #29782 from y-yagi/follow_up_29699Kasper Timm Hansen2017-07-162-13/+36
| |\ | | | | | | Set `represent_boolean_as_integer` via `configuration`
| | * add helper method for explicit lazy loadyuuji.yaginuma2017-07-161-13/+18
| | |
| | * Set `represent_boolean_as_integer` via `configuration`yuuji.yaginuma2017-07-162-1/+19
| | |
| * | Merge pull request #29358 from robin850/dbconsole-connectionKasper Timm Hansen2017-07-166-19/+128
| |\ \ | | | | | | | | Allow to pass a connection to the `dbconsole` command
| | * | Properly expand the environment's nameRobin Dupret2017-07-166-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running the `console` and `dbconsole` commands with a regular argument as the environment's name automatically expand it to match an existing environment (e.g. dev for development). This feature wasn't available using the `--environment` (a.k.a `-e`) option.
| | * | Deprecate environment as an argument for dbconsole and consoleRobin Dupret2017-07-164-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | People should rather rely on the `-e` or `--environment` options to specify in which environment they want to work. This will allow us to specify the connection to pick as a regular argument in the future.
| | * | Allow to pass a connection to the `dbconsole` commandRobin Dupret2017-07-163-2/+64
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 0a4f6009, it's possible to specify a 3-level database configuration to gather connections by environment. The `dbconsole` command will try to look for a database configuration which points to the current environment but with such flavour, the environment key is flushed out so let's add the ability to specify the connection and pick `primary` by default to be consistent with Active Record.
| * / Fix root not being defined on Travis.Kasper Timm Hansen2017-07-161-1/+6
| |/
| * Merge pull request #29645 from y-yagi/check_component_when_run_app_updateKasper Timm Hansen2017-07-165-23/+60
| |\ | | | | | | Do not generate unused components contents in `app:update` task
| | * Do not generate unused components contents in `app:update` taskyuuji.yaginuma2017-07-165-23/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, `app:update` generates all contents regardless of the component using in application. For example, even if not using Action Cable, `app:update` will generate a contents related to Action Cable. This is a little inconvenient. This PR checks the existence of the component and does not generate unnecessary contents. Can not check all options in this way. However, it will be able to prevent the generation of unnecessary files.
| * | Remove blank lines in setupYoshiyuki Hirano2017-07-161-2/+3
| |/
| * Allow to edit secrets in mutiple apps at the same timeyuuji.yaginuma2017-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | In encrypted secrets, the tmp file is used as a fixed file (`secrets.yml.enc` under the tmp directory). And that tmp file will be removed after process. Therefore, if edit secrets at the same time with multiple applications, the tmp file was conflicting. In order to avoid the above issue, added pid to tmp file.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 07:11:12 +0000