提交 5aeac576 编写于 作者: R Rafael França 提交者: GitHub

Merge pull request #30046 from kamipo/fix_string_literals_violations_for_active_storage

Fix `Style/StringLiterals` violations for Active Storage
...@@ -97,8 +97,8 @@ group :storage do ...@@ -97,8 +97,8 @@ group :storage do
gem "google-cloud-storage", "~> 1.3", require: false gem "google-cloud-storage", "~> 1.3", require: false
# Contains fix to be able to test using StringIO # Contains fix to be able to test using StringIO
gem 'azure-core', git: "https://github.com/dixpac/azure-ruby-asm-core.git" gem "azure-core", git: "https://github.com/dixpac/azure-ruby-asm-core.git"
gem 'azure-storage', require: false gem "azure-storage", require: false
gem "mini_magick" gem "mini_magick"
end end
......
...@@ -512,7 +512,6 @@ DEPENDENCIES ...@@ -512,7 +512,6 @@ DEPENDENCIES
libxml-ruby libxml-ruby
listen (>= 3.0.5, < 3.2) listen (>= 3.0.5, < 3.2)
mini_magick mini_magick
minitest (< 5.3.4)
minitest-bisect minitest-bisect
mocha (~> 0.14) mocha (~> 0.14)
mysql2 (>= 0.4.4) mysql2 (>= 0.4.4)
......
require_relative 'config/application' require_relative "config/application"
Rails.application.load_tasks Rails.application.load_tasks
#!/usr/bin/env ruby #!/usr/bin/env ruby
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
load Gem.bin_path('bundler', 'bundle') load Gem.bin_path("bundler", "bundle")
#!/usr/bin/env ruby #!/usr/bin/env ruby
APP_PATH = File.expand_path('../config/application', __dir__) APP_PATH = File.expand_path("../config/application", __dir__)
require_relative '../config/boot' require_relative "../config/boot"
require 'rails/commands' require "rails/commands"
#!/usr/bin/env ruby #!/usr/bin/env ruby
require_relative '../config/boot' require_relative "../config/boot"
require 'rake' require "rake"
Rake.application.run Rake.application.run
#!/usr/bin/env ruby #!/usr/bin/env ruby
VENDOR_PATH = File.expand_path('..', __dir__) VENDOR_PATH = File.expand_path("..", __dir__)
Dir.chdir(VENDOR_PATH) do Dir.chdir(VENDOR_PATH) do
begin begin
exec "yarnpkg #{ARGV.join(" ")}" exec "yarnpkg #{ARGV.join(" ")}"
......
# This file is used by Rack-based servers to start the application. # This file is used by Rack-based servers to start the application.
require_relative 'config/environment' require_relative "config/environment"
run Rails.application run Rails.application
require_relative 'boot' require_relative "boot"
require "rails" require "rails"
require "active_model/railtie" require "active_model/railtie"
......
# Set up gems listed in the Gemfile. # Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__) ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__) $LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)
# Load the Rails application. # Load the Rails application.
require_relative 'application' require_relative "application"
# Initialize the Rails application. # Initialize the Rails application.
Rails.application.initialize! Rails.application.initialize!
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
config.consider_all_requests_local = true config.consider_all_requests_local = true
# Enable/disable caching. By default caching is disabled. # Enable/disable caching. By default caching is disabled.
if Rails.root.join('tmp/caching-dev.txt').exist? if Rails.root.join("tmp/caching-dev.txt").exist?
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
config.cache_store = :memory_store config.cache_store = :memory_store
config.public_file_server.headers = { config.public_file_server.headers = {
'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}"
} }
else else
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# Disable serving static files from the `/public` folder by default since # Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this. # Apache or NGINX already handles this.
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier config.assets.js_compressor = :uglifier
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# Configure public file server for tests with Cache-Control for performance. # Configure public file server for tests with Cache-Control for performance.
config.public_file_server.enabled = true config.public_file_server.enabled = true
config.public_file_server.headers = { config.public_file_server.headers = {
'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" "Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}"
} }
# Show full error reports and disable caching. # Show full error reports and disable caching.
......
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
# Version of your assets, change this if you want to expire all your assets. # Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0' Rails.application.config.assets.version = "1.0"
# Add additional assets to the asset load path. # Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path # Rails.application.config.assets.paths << Emoji.images_path
# Add Yarn node_modules folder to the asset load path. # Add Yarn node_modules folder to the asset load path.
Rails.application.config.assets.paths << Rails.root.join('node_modules') Rails.application.config.assets.paths << Rails.root.join("node_modules")
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets # application.js, application.css, and all non-JS/CSS in the app/assets
......
...@@ -17,8 +17,8 @@ class ActiveStorage::Service::GCSServiceTest < ActiveSupport::TestCase ...@@ -17,8 +17,8 @@ class ActiveStorage::Service::GCSServiceTest < ActiveSupport::TestCase
uri = URI.parse url uri = URI.parse url
request = Net::HTTP::Put.new uri.request_uri request = Net::HTTP::Put.new uri.request_uri
request.body = data request.body = data
request.add_field 'Content-Type', 'text/plain' request.add_field "Content-Type", "text/plain"
request.add_field 'Content-MD5', checksum request.add_field "Content-MD5", checksum
Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http| Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
http.request request http.request request
end end
......
...@@ -17,8 +17,8 @@ class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase ...@@ -17,8 +17,8 @@ class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase
uri = URI.parse url uri = URI.parse url
request = Net::HTTP::Put.new uri.request_uri request = Net::HTTP::Put.new uri.request_uri
request.body = data request.body = data
request.add_field 'Content-Type', 'text/plain' request.add_field "Content-Type", "text/plain"
request.add_field 'Content-MD5', checksum request.add_field "Content-MD5", checksum
Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http| Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
http.request request http.request request
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册