Skip to content

Commit 69e18eb

Browse files
committed
7.1.0.rc1
1 parent 2e60f8f commit 69e18eb

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

.dockerignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Ignore bundler config.
77
/.bundle
88

9+
# Ignore all environment files (except templates).
10+
/.env*
11+
!/.env*.erb
12+
913
# Ignore all default key files.
1014
/config/master.key
1115
/config/credentials/*.key
1216

13-
# Ignore all environment files.
14-
/.env*
15-
!/.env.example
16-
1717
# Ignore all logfiles and tempfiles.
1818
/log/*
1919
/tmp/*

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
# Ignore bundler config.
88
/.bundle
99

10+
# Ignore all environment files (except templates).
11+
/.env*
12+
!/.env*.erb
13+
1014
# Ignore all logfiles and tempfiles.
1115
/log/*
1216
/tmp/*

Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,12 @@ FROM base as build
2121
RUN apt-get update -qq && \
2222
apt-get install --no-install-recommends -y build-essential git libvips pkg-config
2323

24-
25-
2624
# Install application gems
2725
COPY Gemfile Gemfile.lock ./
2826
RUN bundle install && \
2927
rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
3028
bundle exec bootsnap precompile --gemfile
3129

32-
33-
3430
# Copy application code
3531
COPY . .
3632

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source "https://rubygems.org"
33
ruby "your-ruby-version"
44

55
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
6-
gem "rails", "~> 7.1.0.beta1"
6+
gem "rails", "~> 7.1.0.rc1"
77

88
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
99
gem "sprockets-rails"
@@ -66,5 +66,4 @@ group :test do
6666
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
6767
gem "capybara"
6868
gem "selenium-webdriver"
69-
7069
end

config/application.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ class Application < Rails::Application
1111
# Initialize configuration defaults for originally generated Rails version.
1212
config.load_defaults 7.1
1313

14-
# Please, see https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#config-autoload-lib-ignore.
14+
# Please, add to the `ignore` list any other `lib` subdirectories that do
15+
# not contain `.rb` files, or that should not be reloaded or eager loaded.
16+
# Common ones are `templates`, `generators`, or `middleware`, for example.
1517
config.autoload_lib(ignore: %w(assets tasks))
1618

1719
# Configuration for the application, engines, and railties goes here.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Be sure to restart your server when you modify this file.
22

3-
# Configure parameters to be filtered from the log file. Use this to limit dissemination of
4-
# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
5-
# notations and behaviors.
3+
# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
4+
# Use this to limit dissemination of sensitive information.
5+
# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
66
Rails.application.config.filter_parameters += [
77
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
88
]

config/puma.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
# Specifies that the worker count should equal the number of processors in production.
1515
if ENV["RAILS_ENV"] == "production"
16+
require "concurrent-ruby"
1617
worker_count = Integer(ENV.fetch("WEB_CONCURRENCY") { Concurrent.physical_processor_count })
1718
workers worker_count if worker_count > 1
1819
end

config/routes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
get "up" => "rails/health#show", as: :rails_health_check
77

88
# Defines the root path route ("/")
9-
# root "articles#index"
9+
# root "posts#index"
1010
end

0 commit comments

Comments
 (0)