Skip to content

Commit

Permalink
Updates for 08/11/24
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Bot committed Aug 11, 2024
1 parent 0903625 commit 6276583
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-08-10 00:16:38 UTC using RuboCop version 1.65.1.
# on 2024-08-11 00:19:55 UTC using RuboCop version 1.65.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ GIT

GIT
remote: https://github.com/rails/rails.git
revision: c840ceda6870e57e7ec8ff56b8b48defec7e1f64
revision: 72271939d2b680e9d40feaad50543dabb4521a87
branch: 7-2-stable
specs:
actioncable (7.2.0)
Expand Down Expand Up @@ -185,7 +185,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
crack (1.0.0)
bigdecimal
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Hat</title>
<title>Glitter</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="turbo-refresh-method" content="morph">
<%= csrf_meta_tags %>
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)

module Hat
module Glitter
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.1
Expand Down
4 changes: 2 additions & 2 deletions config/cable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
development:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
channel_prefix: hat_development
channel_prefix: glitter_development
test:
adapter: test
production:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
channel_prefix: hat_production
channel_prefix: glitter_production
2 changes: 1 addition & 1 deletion config/cable.yml.bak
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ test:
production:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
channel_prefix: hat_production
channel_prefix: glitter_production
2 changes: 1 addition & 1 deletion config/credentials.yml.enc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
LL7o7594l2Jk6HXjMkYuW8su2AkH+Wb4qfxt6e/U38r6K/5yzTXvnmBm+BYTPzv24kx9GExU90dF9yYRb0fpsLnrk2lGLH+fWb+V78PqkZcRFw8GIC85iAww7kpdNMD5Ht78j+XDGWTYPnOfumwpf3PcYfPm2I0yn7fShOwCPyX64lji2KTiZm5h8btwP3f0RU+07MK3qWajNcpkvaehqIqWslrOHt7fNpIpoSS0wm1mqONrWuZG85TyyXfIeFOmIcUz+/EP5xCoCSOny7pEeZVY5fvqEODNnytfr9k5812uoTMY1SFZK0jJqGaJnNH3YZkb28n2O37DATQCuxWnoFdJnhi6Ugh3geDdXpzLRi/g4WBpd8/rwmMYVNwxnxz5ow+X5cJkm6whUrNo+3v7Rj0Tzxjd--jjmGevs3w6YrPsP8--SZ4MjlTOxquQaje9LscVWA==
Alp+CrgyuF3SEZYkxhUodTVmeAkIUMhkC6MljnWCEj4kTBTuGK/cRKn5zkXlnf6hfDJdqCr6fwJhdWRm5mAvYCL+dAkO4pIciY/nGQ5wrfepIXnB9gYhg0/2yqWIaNGluPeJ4UHsOzyDo/vCcYKpq/M0+GPSIMnnCPrdaMBsbWQQCnP5GngU4Us/7WG2FQ/ziQgvsQaQZtt3zupSb5jWtYA2dbS9aswKK2HJlxa4sxdPbk1q/TPPSfkmhTkPo1h3KjllPHDr4/mN+y2n3UUNs9rdiqJTIgRqjTsXrfqZY04rYSnD+g25AZwjGk98OD5jRLSEjU9VdrXlFzRzfZjvynMkqeJfwCCwgYUqu5ak0IxVaC7xpNN7sMBFjJPhNH/kCt3g4MXks30fLPYB5tQtgp1qASdn--gC1slRPnAMnYtLbS--VAUZamkhBPi043DC9LkFFA==
12 changes: 6 additions & 6 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ default: &default

development:
<<: *default
database: hat_development
database: glitter_development

# The specified database role being used to connect to PostgreSQL.
# To create additional roles in PostgreSQL see `$ createuser --help`.
# When left blank, PostgreSQL will use the default role. This is
# the same name as the operating system user running Rails.
#username: hat
#username: glitter

# The password associated with the PostgreSQL role (username).
#password:
Expand Down Expand Up @@ -55,7 +55,7 @@ development:
# Do not set this db to the same as development or production.
test:
<<: *default
database: hat_test
database: glitter_test

# As with config/credentials.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is
Expand All @@ -79,6 +79,6 @@ test:
#
production:
<<: *default
database: hat_production
username: hat
password: <%= ENV["HAT_DATABASE_PASSWORD"] %>
database: glitter_production
username: glitter
password: <%= ENV["GLITTER_DATABASE_PASSWORD"] %>
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

# Use a real queuing backend for Active Job (and separate queues per environment).
# config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "hat_production"
# config.active_job.queue_name_prefix = "glitter_production"

config.action_mailer.perform_caching = false

Expand Down
4 changes: 2 additions & 2 deletions config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# confirmation, reset password and unlock tokens in the database.
# Devise will use the `secret_key_base` as its `secret_key`
# by default. You can change it below and use your own secret key.
# config.secret_key = '81fb774b65aff88dcf0d6e7cd65f313c6207c7a76f1818cb0bf0db9d4568f21c80e7d1603c7affb40b5eb9fda9c2954547053bc41bbd345eeb5a693a9a0d9b0f'
# config.secret_key = '64679685cb6efcd601bbe1f9ee15b54ad812ca3b97434367793d05c322d8b61f2585390e96dc0f5f515376557f2dd02e46f5b7d0af94d1d2f4e39ea8e613c92f'

# ==> Controller configuration
# Configure the parent class to the devise controllers.
Expand Down Expand Up @@ -126,7 +126,7 @@
config.stretches = Rails.env.test? ? 1 : 12

# Set up a pepper to generate the hashed password.
# config.pepper = '8048f1b9e21194483c9e11f56fa2c2d4136d3db21569f1675824c5a24274635cabb8e5d334857c609b55febaaa1ee1ba7491983c91351356dd1472faa6018bbb'
# config.pepper = '5d94da5864a3cd1c9bc778de5ded4f61a38cae5bebf9784c025d0448acbb5838951de3f4ff85afb2f3517a852b69df6d425cecdcf1ae5850ed6fce9a2ed4dbbe'

# Send a notification to the original email when the user's email is changed.
# config.send_email_changed_notification = false
Expand Down
2 changes: 1 addition & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6276583

Please sign in to comment.