railties 6.1.7.8 → 7.0.8.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +219 -320
- data/RDOC_MAIN.rdoc +16 -16
- data/README.rdoc +1 -2
- data/lib/minitest/rails_plugin.rb +1 -1
- data/lib/rails/all.rb +0 -1
- data/lib/rails/app_updater.rb +9 -6
- data/lib/rails/application/bootstrap.rb +24 -5
- data/lib/rails/application/configuration.rb +95 -33
- data/lib/rails/application/default_middleware_stack.rb +22 -3
- data/lib/rails/application/finisher.rb +53 -95
- data/lib/rails/application/routes_reloader.rb +8 -0
- data/lib/rails/application.rb +74 -101
- data/lib/rails/application_controller.rb +3 -3
- data/lib/rails/autoloaders/inflector.rb +21 -0
- data/lib/rails/autoloaders.rb +42 -42
- data/lib/rails/code_statistics.rb +2 -2
- data/lib/rails/code_statistics_calculator.rb +10 -1
- data/lib/rails/command/base.rb +26 -12
- data/lib/rails/command/behavior.rb +1 -1
- data/lib/rails/command/environment_argument.rb +1 -1
- data/lib/rails/command.rb +9 -6
- data/lib/rails/commands/console/console_command.rb +4 -0
- data/lib/rails/commands/credentials/USAGE +4 -2
- data/lib/rails/commands/credentials/credentials_command/diffing.rb +26 -16
- data/lib/rails/commands/credentials/credentials_command.rb +7 -3
- data/lib/rails/commands/dbconsole/dbconsole_command.rb +10 -11
- data/lib/rails/commands/help/USAGE +3 -2
- data/lib/rails/commands/runner/runner_command.rb +3 -2
- data/lib/rails/commands/server/server_command.rb +7 -5
- data/lib/rails/configuration.rb +18 -23
- data/lib/rails/console/helpers.rb +2 -2
- data/lib/rails/engine/configuration.rb +3 -3
- data/lib/rails/engine.rb +31 -37
- data/lib/rails/gem_version.rb +5 -5
- data/lib/rails/generators/actions/create_migration.rb +2 -4
- data/lib/rails/generators/actions.rb +229 -62
- data/lib/rails/generators/app_base.rb +155 -130
- data/lib/rails/generators/app_name.rb +1 -1
- data/lib/rails/generators/base.rb +12 -16
- data/lib/rails/generators/erb/scaffold/scaffold_generator.rb +2 -0
- data/lib/rails/generators/erb/scaffold/templates/_form.html.erb.tt +8 -8
- data/lib/rails/generators/erb/scaffold/templates/edit.html.erb.tt +8 -4
- data/lib/rails/generators/erb/scaffold/templates/index.html.erb.tt +11 -28
- data/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt +7 -3
- data/lib/rails/generators/erb/scaffold/templates/partial.html.erb.tt +17 -0
- data/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt +8 -17
- data/lib/rails/generators/erb.rb +1 -1
- data/lib/rails/generators/generated_attribute.rb +45 -9
- data/lib/rails/generators/migration.rb +2 -6
- data/lib/rails/generators/model_helpers.rb +1 -1
- data/lib/rails/generators/named_base.rb +13 -13
- data/lib/rails/generators/rails/app/app_generator.rb +70 -91
- data/lib/rails/generators/rails/app/templates/Gemfile.tt +44 -52
- data/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css.tt +2 -2
- data/lib/rails/generators/rails/app/templates/app/mailers/application_mailer.rb.tt +2 -2
- data/lib/rails/generators/rails/app/templates/app/models/application_record.rb.tt +1 -1
- data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt +3 -9
- data/lib/rails/generators/rails/app/templates/bin/rails.tt +1 -4
- data/lib/rails/generators/rails/app/templates/bin/rake.tt +0 -3
- data/lib/rails/generators/rails/app/templates/bin/setup.tt +9 -14
- data/lib/rails/generators/rails/app/templates/config/application.rb.tt +0 -1
- data/lib/rails/generators/rails/app/templates/config/boot.rb.tt +1 -1
- data/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt +1 -1
- data/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml.tt +5 -5
- data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +7 -13
- data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +12 -39
- data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +7 -12
- data/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt +1 -5
- data/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt +21 -28
- data/lib/rails/generators/rails/app/templates/config/initializers/cors.rb.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/initializers/filter_parameter_logging.rb.tt +3 -1
- data/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb.tt +4 -4
- data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt +143 -0
- data/lib/rails/generators/rails/app/templates/config/locales/en.yml +3 -3
- data/lib/rails/generators/rails/app/templates/config/puma.rb.tt +1 -1
- data/lib/rails/generators/rails/app/templates/config/routes.rb.tt +4 -1
- data/lib/rails/generators/rails/app/templates/config/storage.yml.tt +5 -5
- data/lib/rails/generators/rails/app/templates/db/seeds.rb.tt +2 -2
- data/lib/rails/generators/rails/app/templates/gitattributes.tt +0 -5
- data/lib/rails/generators/rails/app/templates/gitignore.tt +3 -1
- data/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt +1 -1
- data/lib/rails/generators/rails/controller/controller_generator.rb +1 -2
- data/lib/rails/generators/rails/controller/templates/controller.rb.tt +0 -4
- data/lib/rails/generators/rails/db/system/change/change_generator.rb +1 -1
- data/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt +1 -1
- data/lib/rails/generators/rails/plugin/plugin_generator.rb +76 -27
- data/lib/rails/generators/rails/plugin/templates/%name%.gemspec.tt +7 -3
- data/lib/rails/generators/rails/plugin/templates/Gemfile.tt +9 -31
- data/lib/rails/generators/rails/plugin/templates/README.md.tt +1 -1
- data/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt +2 -2
- data/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt +0 -3
- data/lib/rails/generators/rails/plugin/templates/bin/rails.tt +7 -6
- data/lib/rails/generators/rails/plugin/templates/gitignore.tt +0 -5
- data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb.tt +2 -2
- data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb.tt +1 -1
- data/lib/rails/generators/rails/plugin/templates/rails/boot.rb.tt +2 -2
- data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb.tt +2 -7
- data/lib/rails/generators/rails/scaffold/scaffold_generator.rb +0 -19
- data/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt +1 -5
- data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt +6 -10
- data/lib/rails/generators/resource_helpers.rb +2 -2
- data/lib/rails/generators/test_unit/generator/templates/generator_test.rb.tt +1 -1
- data/lib/rails/generators/test_unit/model/templates/fixtures.yml.tt +2 -2
- data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +3 -3
- data/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb.tt +5 -5
- data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb.tt +7 -7
- data/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt +9 -11
- data/lib/rails/generators/testing/behaviour.rb +3 -4
- data/lib/rails/generators.rb +17 -24
- data/lib/rails/info.rb +1 -1
- data/lib/rails/info_controller.rb +1 -3
- data/lib/rails/initializable.rb +1 -1
- data/lib/rails/mailers_controller.rb +2 -4
- data/lib/rails/paths.rb +1 -1
- data/lib/rails/rack/logger.rb +7 -9
- data/lib/rails/railtie/configuration.rb +1 -2
- data/lib/rails/railtie.rb +36 -13
- data/lib/rails/ruby_version_check.rb +3 -3
- data/lib/rails/source_annotation_extractor.rb +1 -1
- data/lib/rails/tasks/framework.rake +7 -9
- data/lib/rails/tasks/statistics.rake +3 -1
- data/lib/rails/tasks/tmp.rake +8 -1
- data/lib/rails/tasks/yarn.rake +8 -9
- data/lib/rails/tasks/zeitwerk.rake +2 -10
- data/lib/rails/templates/layouts/application.html.erb +15 -0
- data/lib/rails/templates/rails/mailers/email.html.erb +13 -11
- data/lib/rails/templates/rails/welcome/index.html.erb +64 -48
- data/lib/rails/test_help.rb +4 -0
- data/lib/rails/test_unit/railtie.rb +0 -4
- data/lib/rails/test_unit/runner.rb +16 -9
- data/lib/rails/test_unit/testing.rake +4 -9
- data/lib/rails/version.rb +1 -1
- data/lib/rails/welcome_controller.rb +1 -0
- data/lib/rails.rb +13 -2
- metadata +33 -37
- data/lib/rails/command/spellchecker.rb +0 -57
- data/lib/rails/generators/css/assets/assets_generator.rb +0 -15
- data/lib/rails/generators/css/assets/templates/stylesheet.css +0 -4
- data/lib/rails/generators/css/scaffold/scaffold_generator.rb +0 -18
- data/lib/rails/generators/rails/app/templates/app/javascript/channels/consumer.js +0 -6
- data/lib/rails/generators/rails/app/templates/app/javascript/channels/index.js +0 -5
- data/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt +0 -23
- data/lib/rails/generators/rails/app/templates/bin/spring.tt +0 -13
- data/lib/rails/generators/rails/app/templates/bin/yarn.tt +0 -16
- data/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb.tt +0 -8
- data/lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb.tt +0 -8
- data/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb.tt +0 -5
- data/lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb.tt +0 -4
- data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_1.rb.tt +0 -67
- data/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt +0 -16
- data/lib/rails/generators/rails/app/templates/config/spring.rb.tt +0 -6
- data/lib/rails/generators/rails/app/templates/package.json.tt +0 -11
- data/lib/rails/generators/rails/assets/USAGE +0 -16
- data/lib/rails/generators/rails/assets/assets_generator.rb +0 -26
- data/lib/rails/generators/rails/assets/templates/stylesheet.css +0 -4
- data/lib/rails/generators/rails/scaffold/templates/scaffold.css +0 -80
@@ -1,78 +1,70 @@
|
|
1
|
-
source
|
1
|
+
source "https://rubygems.org"
|
2
2
|
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
|
3
3
|
|
4
|
-
ruby <%= "
|
5
|
-
|
6
|
-
<% unless gemfile_entries.first&.comment -%>
|
4
|
+
ruby <%= "\"#{RUBY_VERSION}\"" -%>
|
7
5
|
|
6
|
+
<% gemfile_entries.each do |gemfile_entry| %>
|
7
|
+
<%= gemfile_entry %>
|
8
8
|
<% end -%>
|
9
|
-
<%
|
10
|
-
<% if gem.comment -%>
|
9
|
+
<% unless options.minimal? -%>
|
11
10
|
|
12
|
-
#
|
13
|
-
|
14
|
-
<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
|
15
|
-
<% if gem.options.any? -%>
|
16
|
-
, <%= gem.options.map { |k,v|
|
17
|
-
"#{k}: #{v.inspect.gsub('"', '\'')}" }.join(', ') %>
|
18
|
-
<% end -%>
|
19
|
-
<% end -%>
|
11
|
+
# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
|
12
|
+
# gem "kredis"
|
20
13
|
|
21
|
-
# Use Active Model has_secure_password
|
22
|
-
# gem
|
23
|
-
<% unless skip_active_storage? -%>
|
24
|
-
|
25
|
-
# Use Active Storage variant
|
26
|
-
# gem 'image_processing', '~> 1.2'
|
14
|
+
# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
|
15
|
+
# gem "bcrypt", "~> 3.1.7"
|
27
16
|
<% end -%>
|
28
17
|
|
18
|
+
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
19
|
+
gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
|
29
20
|
<% if depend_on_bootsnap? -%>
|
21
|
+
|
30
22
|
# Reduces boot times through caching; required in config/boot.rb
|
31
|
-
gem
|
23
|
+
gem "bootsnap", require: false
|
24
|
+
<% end -%>
|
25
|
+
<% unless skip_sprockets? || options.minimal? -%>
|
32
26
|
|
33
|
-
|
27
|
+
# Use Sass to process CSS
|
28
|
+
# gem "sassc-rails"
|
29
|
+
<% end -%>
|
30
|
+
<% unless skip_active_storage? -%>
|
31
|
+
|
32
|
+
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
|
33
|
+
# gem "image_processing", "~> 1.2"
|
34
|
+
<% end -%>
|
34
35
|
<%- if options.api? -%>
|
35
|
-
# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
|
36
|
-
# gem 'rack-cors'
|
37
36
|
|
37
|
+
# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
|
38
|
+
# gem "rack-cors"
|
38
39
|
<%- end -%>
|
39
|
-
<% if RUBY_ENGINE ==
|
40
|
+
<% if RUBY_ENGINE == "ruby" -%>
|
41
|
+
|
40
42
|
group :development, :test do
|
41
|
-
#
|
42
|
-
gem
|
43
|
+
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
|
44
|
+
gem "debug", platforms: %i[ mri mingw x64_mingw ]
|
43
45
|
end
|
44
|
-
|
45
46
|
<% end -%>
|
47
|
+
|
46
48
|
group :development do
|
47
49
|
<%- unless options.api? || options.skip_dev_gems? -%>
|
48
|
-
#
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
gem
|
53
|
-
|
54
|
-
# Display performance information such as SQL time and flame graphs for each request in your browser.
|
55
|
-
# Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
|
56
|
-
gem 'rack-mini-profiler', '~> 2.0'
|
50
|
+
# Use console on exceptions pages [https://github.com/rails/web-console]
|
51
|
+
gem "web-console"
|
52
|
+
|
53
|
+
# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
|
54
|
+
# gem "rack-mini-profiler"
|
55
|
+
|
57
56
|
<%- end -%>
|
58
|
-
|
59
|
-
gem
|
60
|
-
<% end -%>
|
61
|
-
<% if spring_install? -%>
|
62
|
-
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
|
63
|
-
gem 'spring'
|
64
|
-
<% end -%>
|
57
|
+
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
|
58
|
+
# gem "spring"
|
65
59
|
end
|
66
60
|
|
67
61
|
<%- if depends_on_system_test? -%>
|
68
62
|
group :test do
|
69
|
-
#
|
70
|
-
gem
|
71
|
-
gem
|
72
|
-
|
73
|
-
gem
|
63
|
+
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
|
64
|
+
gem "capybara"
|
65
|
+
gem "selenium-webdriver"
|
66
|
+
<%- if RUBY_VERSION < "3.0" -%>
|
67
|
+
gem "webdrivers"
|
68
|
+
<% end %>
|
74
69
|
end
|
75
|
-
|
76
70
|
<%- end -%>
|
77
|
-
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
78
|
-
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
|
@@ -2,11 +2,11 @@
|
|
2
2
|
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
3
3
|
* listed below.
|
4
4
|
*
|
5
|
-
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
|
5
|
+
* Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's
|
6
6
|
* vendor/assets/stylesheets directory can be referenced here using a relative path.
|
7
7
|
*
|
8
8
|
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
|
9
|
-
* compiled file so the styles you add here take precedence over styles defined in any other CSS
|
9
|
+
* compiled file so the styles you add here take precedence over styles defined in any other CSS
|
10
10
|
* files in this directory. Styles in this file should be added after the last require_* statement.
|
11
11
|
* It is generally better to create a new file per style scope.
|
12
12
|
*
|
@@ -6,16 +6,10 @@
|
|
6
6
|
<%%= csrf_meta_tags %>
|
7
7
|
<%%= csp_meta_tag %>
|
8
8
|
|
9
|
-
<%- if options[:skip_javascript] -%>
|
10
|
-
<%%= stylesheet_link_tag
|
9
|
+
<%- if options[:skip_hotwire] || options[:skip_javascript] -%>
|
10
|
+
<%%= stylesheet_link_tag "application" %>
|
11
11
|
<%- else -%>
|
12
|
-
|
13
|
-
<%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
14
|
-
<%%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
|
15
|
-
<%- else -%>
|
16
|
-
<%%= stylesheet_link_tag 'application', media: 'all' %>
|
17
|
-
<%%= javascript_pack_tag 'application' %>
|
18
|
-
<%- end -%>
|
12
|
+
<%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
|
19
13
|
<%- end -%>
|
20
14
|
</head>
|
21
15
|
|
@@ -1,6 +1,3 @@
|
|
1
|
-
|
2
|
-
load File.expand_path("spring", __dir__)
|
3
|
-
<% end -%>
|
4
|
-
APP_PATH = File.expand_path('../config/application', __dir__)
|
1
|
+
APP_PATH = File.expand_path("../config/application", __dir__)
|
5
2
|
require_relative "../config/boot"
|
6
3
|
require "rails/commands"
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require "fileutils"
|
2
2
|
|
3
3
|
# path to your application root.
|
4
|
-
APP_ROOT = File.expand_path(
|
4
|
+
APP_ROOT = File.expand_path("..", __dir__)
|
5
5
|
|
6
6
|
def system!(*args)
|
7
7
|
system(*args) || abort("\n== Command #{args} failed ==")
|
@@ -12,28 +12,23 @@ FileUtils.chdir APP_ROOT do
|
|
12
12
|
# This script is idempotent, so that you can run it at any time and get an expectable outcome.
|
13
13
|
# Add necessary setup steps to this file.
|
14
14
|
|
15
|
-
puts
|
16
|
-
system!
|
17
|
-
system(
|
18
|
-
<% unless options.skip_javascript? -%>
|
19
|
-
|
20
|
-
# Install JavaScript dependencies
|
21
|
-
system! 'bin/yarn'
|
22
|
-
<% end -%>
|
15
|
+
puts "== Installing dependencies =="
|
16
|
+
system! "gem install bundler --conservative"
|
17
|
+
system("bundle check") || system!("bundle install")
|
23
18
|
<% unless options.skip_active_record? -%>
|
24
19
|
|
25
20
|
# puts "\n== Copying sample files =="
|
26
|
-
# unless File.exist?(
|
27
|
-
# FileUtils.cp
|
21
|
+
# unless File.exist?("config/database.yml")
|
22
|
+
# FileUtils.cp "config/database.yml.sample", "config/database.yml"
|
28
23
|
# end
|
29
24
|
|
30
25
|
puts "\n== Preparing database =="
|
31
|
-
system!
|
26
|
+
system! "bin/rails db:prepare"
|
32
27
|
<% end -%>
|
33
28
|
|
34
29
|
puts "\n== Removing old logs and tempfiles =="
|
35
|
-
system!
|
30
|
+
system! "bin/rails log:clear tmp:clear"
|
36
31
|
|
37
32
|
puts "\n== Restarting application server =="
|
38
|
-
system!
|
33
|
+
system! "bin/rails restart"
|
39
34
|
end
|
@@ -15,7 +15,6 @@ require "action_controller/railtie"
|
|
15
15
|
<%= comment_if :skip_action_text %>require "action_text/engine"
|
16
16
|
require "action_view/railtie"
|
17
17
|
<%= comment_if :skip_action_cable %>require "action_cable/engine"
|
18
|
-
<%= comment_if :skip_sprockets %>require "sprockets/railtie"
|
19
18
|
<%= comment_if :skip_test %>require "rails/test_unit/railtie"
|
20
19
|
<% end -%>
|
21
20
|
|
@@ -3,7 +3,7 @@
|
|
3
3
|
# gem install activerecord-jdbcmssql-adapter
|
4
4
|
#
|
5
5
|
# Configure using Gemfile:
|
6
|
-
# gem
|
6
|
+
# gem "activerecord-jdbcmssql-adapter"
|
7
7
|
#
|
8
8
|
# development:
|
9
9
|
# adapter: mssql
|
@@ -65,4 +65,4 @@ test:
|
|
65
65
|
production:
|
66
66
|
url: jdbc:db://localhost/<%= app_name %>_production
|
67
67
|
username: <%= app_name %>
|
68
|
-
password: <%%= ENV[
|
68
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
# gem install activerecord-jdbcmysql-adapter
|
5
5
|
#
|
6
6
|
# Configure Using Gemfile
|
7
|
-
# gem
|
7
|
+
# gem "activerecord-jdbcmysql-adapter"
|
8
8
|
#
|
9
9
|
# And be sure to use new-style password hashing:
|
10
10
|
# https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
|
@@ -42,7 +42,7 @@ test:
|
|
42
42
|
# URL environment variable explicitly:
|
43
43
|
#
|
44
44
|
# production:
|
45
|
-
# url: <%%= ENV[
|
45
|
+
# url: <%%= ENV["MY_APP_DATABASE_URL"] %>
|
46
46
|
#
|
47
47
|
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
48
48
|
# for a full overview on how database connection configuration can be specified.
|
@@ -51,4 +51,4 @@ production:
|
|
51
51
|
<<: *default
|
52
52
|
database: <%= app_name %>_production
|
53
53
|
username: <%= app_name %>
|
54
|
-
password: <%%= ENV[
|
54
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# PostgreSQL. Versions 9.3 and up are supported.
|
2
2
|
#
|
3
3
|
# Configure Using Gemfile
|
4
|
-
# gem
|
4
|
+
# gem "activerecord-jdbcpostgresql-adapter"
|
5
5
|
#
|
6
6
|
default: &default
|
7
7
|
adapter: postgresql
|
@@ -58,7 +58,7 @@ test:
|
|
58
58
|
# URL environment variable explicitly:
|
59
59
|
#
|
60
60
|
# production:
|
61
|
-
# url: <%%= ENV[
|
61
|
+
# url: <%%= ENV["MY_APP_DATABASE_URL"] %>
|
62
62
|
#
|
63
63
|
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
64
64
|
# for a full overview on how database connection configuration can be specified.
|
@@ -67,4 +67,4 @@ production:
|
|
67
67
|
<<: *default
|
68
68
|
database: <%= app_name %>_production
|
69
69
|
username: <%= app_name %>
|
70
|
-
password: <%%= ENV[
|
70
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
# SQLite. Versions 3.8.0 and up are supported.
|
2
|
-
# gem
|
2
|
+
# gem "activerecord-jdbcsqlite3-adapter"
|
3
3
|
#
|
4
4
|
# Configure Using Gemfile
|
5
|
-
# gem
|
5
|
+
# gem "activerecord-jdbcsqlite3-adapter"
|
6
6
|
#
|
7
7
|
default: &default
|
8
8
|
adapter: sqlite3
|
@@ -4,7 +4,7 @@
|
|
4
4
|
# gem install mysql2
|
5
5
|
#
|
6
6
|
# Ensure the MySQL gem is defined in your Gemfile
|
7
|
-
# gem
|
7
|
+
# gem "mysql2"
|
8
8
|
#
|
9
9
|
# And be sure to use new-style password hashing:
|
10
10
|
# https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
|
@@ -47,7 +47,7 @@ test:
|
|
47
47
|
# URL environment variable explicitly:
|
48
48
|
#
|
49
49
|
# production:
|
50
|
-
# url: <%%= ENV[
|
50
|
+
# url: <%%= ENV["MY_APP_DATABASE_URL"] %>
|
51
51
|
#
|
52
52
|
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
53
53
|
# for a full overview on how database connection configuration can be specified.
|
@@ -56,4 +56,4 @@ production:
|
|
56
56
|
<<: *default
|
57
57
|
database: <%= app_name %>_production
|
58
58
|
username: <%= app_name %>
|
59
|
-
password: <%%= ENV[
|
59
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -50,7 +50,7 @@ test:
|
|
50
50
|
# URL environment variable explicitly:
|
51
51
|
#
|
52
52
|
# production:
|
53
|
-
# url: <%%= ENV[
|
53
|
+
# url: <%%= ENV["MY_APP_DATABASE_URL"] %>
|
54
54
|
#
|
55
55
|
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
56
56
|
# for a full overview on how database connection configuration can be specified.
|
@@ -59,4 +59,4 @@ production:
|
|
59
59
|
<<: *default
|
60
60
|
database: <%= app_name %>_production
|
61
61
|
username: <%= app_name %>
|
62
|
-
password: <%%= ENV[
|
62
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -12,7 +12,7 @@
|
|
12
12
|
# Install PostgreSQL and put its /bin directory on your path.
|
13
13
|
#
|
14
14
|
# Configure Using Gemfile
|
15
|
-
# gem
|
15
|
+
# gem "pg"
|
16
16
|
#
|
17
17
|
default: &default
|
18
18
|
adapter: postgresql
|
@@ -74,7 +74,7 @@ test:
|
|
74
74
|
# URL environment variable explicitly:
|
75
75
|
#
|
76
76
|
# production:
|
77
|
-
# url: <%%= ENV[
|
77
|
+
# url: <%%= ENV["MY_APP_DATABASE_URL"] %>
|
78
78
|
#
|
79
79
|
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
80
80
|
# for a full overview on how database connection configuration can be specified.
|
@@ -83,4 +83,4 @@ production:
|
|
83
83
|
<<: *default
|
84
84
|
database: <%= app_name %>_production
|
85
85
|
username: <%= app_name %>
|
86
|
-
password: <%%= ENV[
|
86
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -5,14 +5,14 @@
|
|
5
5
|
# gem install activerecord-sqlserver-adapter
|
6
6
|
#
|
7
7
|
# Ensure the activerecord adapter and db driver gems are defined in your Gemfile
|
8
|
-
# gem
|
9
|
-
# gem
|
8
|
+
# gem "tiny_tds"
|
9
|
+
# gem "activerecord-sqlserver-adapter"
|
10
10
|
#
|
11
11
|
default: &default
|
12
12
|
adapter: sqlserver
|
13
13
|
encoding: utf8
|
14
14
|
username: sa
|
15
|
-
password: <%%= ENV[
|
15
|
+
password: <%%= ENV["SA_PASSWORD"] %>
|
16
16
|
host: localhost
|
17
17
|
|
18
18
|
development:
|
@@ -41,7 +41,7 @@ test:
|
|
41
41
|
# URL environment variable explicitly:
|
42
42
|
#
|
43
43
|
# production:
|
44
|
-
# url: <%%= ENV[
|
44
|
+
# url: <%%= ENV["MY_APP_DATABASE_URL"] %>
|
45
45
|
#
|
46
46
|
# Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
|
47
47
|
# for a full overview on how database connection configuration can be specified.
|
@@ -50,4 +50,4 @@ production:
|
|
50
50
|
<<: *default
|
51
51
|
database: <%= app_name %>_production
|
52
52
|
username: <%= app_name %>
|
53
|
-
password: <%%= ENV[
|
53
|
+
password: <%%= ENV["<%= app_name.upcase %>_DATABASE_PASSWORD"] %>
|
@@ -14,9 +14,12 @@ Rails.application.configure do
|
|
14
14
|
# Show full error reports.
|
15
15
|
config.consider_all_requests_local = true
|
16
16
|
|
17
|
+
# Enable server timing
|
18
|
+
config.server_timing = true
|
19
|
+
|
17
20
|
# Enable/disable caching. By default caching is disabled.
|
18
21
|
# Run rails dev:cache to toggle caching.
|
19
|
-
if Rails.root.join(
|
22
|
+
if Rails.root.join("tmp/caching-dev.txt").exist?
|
20
23
|
<%- unless options.api? -%>
|
21
24
|
config.action_controller.perform_caching = true
|
22
25
|
config.action_controller.enable_fragment_cache_logging = true
|
@@ -24,7 +27,7 @@ Rails.application.configure do
|
|
24
27
|
<%- end -%>
|
25
28
|
config.cache_store = :memory_store
|
26
29
|
config.public_file_server.headers = {
|
27
|
-
|
30
|
+
"Cache-Control" => "public, max-age=#{2.days.to_i}"
|
28
31
|
}
|
29
32
|
else
|
30
33
|
config.action_controller.perform_caching = false
|
@@ -36,7 +39,7 @@ Rails.application.configure do
|
|
36
39
|
# Store uploaded files on the local file system (see config/storage.yml for options).
|
37
40
|
config.active_storage.service = :local
|
38
41
|
<%- end -%>
|
39
|
-
<%- unless
|
42
|
+
<%- unless skip_action_mailer? -%>
|
40
43
|
|
41
44
|
# Don't care if the mailer can't send.
|
42
45
|
config.action_mailer.raise_delivery_errors = false
|
@@ -61,12 +64,7 @@ Rails.application.configure do
|
|
61
64
|
config.active_record.verbose_query_logs = true
|
62
65
|
|
63
66
|
<%- end -%>
|
64
|
-
<%- unless
|
65
|
-
# Debug mode disables concatenation and preprocessing of assets.
|
66
|
-
# This option may cause significant delays in view rendering with a large
|
67
|
-
# number of complex assets.
|
68
|
-
config.assets.debug = true
|
69
|
-
|
67
|
+
<%- unless skip_sprockets? -%>
|
70
68
|
# Suppress logger output for asset requests.
|
71
69
|
config.assets.quiet = true
|
72
70
|
<%- end -%>
|
@@ -77,10 +75,6 @@ Rails.application.configure do
|
|
77
75
|
# Annotate rendered view with file names.
|
78
76
|
# config.action_view.annotate_rendered_view_with_filenames = true
|
79
77
|
|
80
|
-
# Use an evented file watcher to asynchronously detect changes in source code,
|
81
|
-
# routes, locales, etc. This feature depends on the listen gem.
|
82
|
-
<%= '# ' unless depend_on_listen? %>config.file_watcher = ActiveSupport::EventedFileUpdateChecker
|
83
|
-
|
84
78
|
# Uncomment if you wish to allow Action Cable access from any origin.
|
85
79
|
# config.action_cable.disable_request_forgery_protection = true
|
86
80
|
end
|
@@ -24,9 +24,9 @@ Rails.application.configure do
|
|
24
24
|
|
25
25
|
# Disable serving static files from the `/public` folder by default since
|
26
26
|
# Apache or NGINX already handles this.
|
27
|
-
config.public_file_server.enabled = ENV[
|
27
|
+
config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
|
28
28
|
|
29
|
-
<%- unless
|
29
|
+
<%- unless skip_sprockets? -%>
|
30
30
|
# Compress CSS using a preprocessor.
|
31
31
|
# config.assets.css_compressor = :sass
|
32
32
|
|
@@ -35,11 +35,11 @@ Rails.application.configure do
|
|
35
35
|
|
36
36
|
<%- end -%>
|
37
37
|
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
|
38
|
-
# config.asset_host =
|
38
|
+
# config.asset_host = "http://assets.example.com"
|
39
39
|
|
40
40
|
# Specifies the header that your server uses for sending files.
|
41
|
-
# config.action_dispatch.x_sendfile_header =
|
42
|
-
# config.action_dispatch.x_sendfile_header =
|
41
|
+
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
|
42
|
+
# config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
|
43
43
|
|
44
44
|
<%- unless skip_active_storage? -%>
|
45
45
|
# Store uploaded files on the local file system (see config/storage.yml for options).
|
@@ -49,8 +49,8 @@ Rails.application.configure do
|
|
49
49
|
<%- unless options[:skip_action_cable] -%>
|
50
50
|
# Mount Action Cable outside main process or domain.
|
51
51
|
# config.action_cable.mount_path = nil
|
52
|
-
# config.action_cable.url =
|
53
|
-
# config.action_cable.allowed_request_origins = [
|
52
|
+
# config.action_cable.url = "wss://example.com/cable"
|
53
|
+
# config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
|
54
54
|
|
55
55
|
<%- end -%>
|
56
56
|
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
|
@@ -70,9 +70,9 @@ Rails.application.configure do
|
|
70
70
|
# Use a real queuing backend for Active Job (and separate queues per environment).
|
71
71
|
# config.active_job.queue_adapter = :resque
|
72
72
|
# config.active_job.queue_name_prefix = "<%= app_name %>_production"
|
73
|
-
<%- end -%>
|
74
73
|
|
75
|
-
<%-
|
74
|
+
<%- end -%>
|
75
|
+
<%- unless skip_action_mailer? -%>
|
76
76
|
config.action_mailer.perform_caching = false
|
77
77
|
|
78
78
|
# Ignore bad email addresses and do not raise email delivery errors.
|
@@ -84,21 +84,15 @@ Rails.application.configure do
|
|
84
84
|
# the I18n.default_locale when a translation cannot be found).
|
85
85
|
config.i18n.fallbacks = true
|
86
86
|
|
87
|
-
#
|
88
|
-
config.active_support.
|
89
|
-
|
90
|
-
# Log disallowed deprecations.
|
91
|
-
config.active_support.disallowed_deprecation = :log
|
92
|
-
|
93
|
-
# Tell Active Support which deprecation messages to disallow.
|
94
|
-
config.active_support.disallowed_deprecation_warnings = []
|
87
|
+
# Don't log any deprecations.
|
88
|
+
config.active_support.report_deprecations = false
|
95
89
|
|
96
90
|
# Use default logging formatter so that PID and timestamp are not suppressed.
|
97
91
|
config.log_formatter = ::Logger::Formatter.new
|
98
92
|
|
99
93
|
# Use a different logger for distributed setups.
|
100
94
|
# require "syslog/logger"
|
101
|
-
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new
|
95
|
+
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
|
102
96
|
|
103
97
|
if ENV["RAILS_LOG_TO_STDOUT"].present?
|
104
98
|
logger = ActiveSupport::Logger.new(STDOUT)
|
@@ -110,25 +104,4 @@ Rails.application.configure do
|
|
110
104
|
# Do not dump schema after migrations.
|
111
105
|
config.active_record.dump_schema_after_migration = false
|
112
106
|
<%- end -%>
|
113
|
-
|
114
|
-
# Inserts middleware to perform automatic connection switching.
|
115
|
-
# The `database_selector` hash is used to pass options to the DatabaseSelector
|
116
|
-
# middleware. The `delay` is used to determine how long to wait after a write
|
117
|
-
# to send a subsequent read to the primary.
|
118
|
-
#
|
119
|
-
# The `database_resolver` class is used by the middleware to determine which
|
120
|
-
# database is appropriate to use based on the time delay.
|
121
|
-
#
|
122
|
-
# The `database_resolver_context` class is used by the middleware to set
|
123
|
-
# timestamps for the last write to the primary. The resolver uses the context
|
124
|
-
# class timestamps to determine how long to wait before reading from the
|
125
|
-
# replica.
|
126
|
-
#
|
127
|
-
# By default Rails will store a last write timestamp in the session. The
|
128
|
-
# DatabaseSelector middleware is designed as such you can define your own
|
129
|
-
# strategy for connection switching and pass that into the middleware through
|
130
|
-
# these configuration options.
|
131
|
-
# config.active_record.database_selector = { delay: 2.seconds }
|
132
|
-
# config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
|
133
|
-
# config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
|
134
107
|
end
|
@@ -8,23 +8,18 @@ require "active_support/core_ext/integer/time"
|
|
8
8
|
Rails.application.configure do
|
9
9
|
# Settings specified here will take precedence over those in config/application.rb.
|
10
10
|
|
11
|
-
|
12
|
-
<%- if spring_install? -%>
|
13
|
-
config.cache_classes = false
|
14
|
-
config.action_view.cache_template_loading = true
|
15
|
-
<%- else -%>
|
11
|
+
# Turn false under Spring and add config.action_view.cache_template_loading = true.
|
16
12
|
config.cache_classes = true
|
17
|
-
<%- end -%>
|
18
13
|
|
19
|
-
#
|
20
|
-
#
|
21
|
-
#
|
22
|
-
config.eager_load =
|
14
|
+
# Eager loading loads your whole application. When running a single test locally,
|
15
|
+
# this probably isn't necessary. It's a good idea to do in a continuous integration
|
16
|
+
# system, or in some way before deploying your code.
|
17
|
+
config.eager_load = ENV["CI"].present?
|
23
18
|
|
24
19
|
# Configure public file server for tests with Cache-Control for performance.
|
25
20
|
config.public_file_server.enabled = true
|
26
21
|
config.public_file_server.headers = {
|
27
|
-
|
22
|
+
"Cache-Control" => "public, max-age=#{1.hour.to_i}"
|
28
23
|
}
|
29
24
|
|
30
25
|
# Show full error reports and disable caching.
|
@@ -43,7 +38,7 @@ Rails.application.configure do
|
|
43
38
|
config.active_storage.service = :test
|
44
39
|
|
45
40
|
<%- end -%>
|
46
|
-
<%- unless
|
41
|
+
<%- unless skip_action_mailer? -%>
|
47
42
|
config.action_mailer.perform_caching = false
|
48
43
|
|
49
44
|
# Tell Action Mailer not to deliver emails to the real world.
|