Skip to content

Commit

Permalink
Updates for 08/11/23
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Bot committed Aug 11, 2023
1 parent befdc52 commit 45e28ee
Show file tree
Hide file tree
Showing 14 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 2023-08-10 00:15:57 UTC using RuboCop version 1.56.0.
# on 2023-08-11 00:13:54 UTC using RuboCop version 1.56.0.
# 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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ GEM
sassc-rails (~> 2.1)
selectize-rails (~> 0.6)
aws-eventstream (1.2.0)
aws-partitions (1.801.0)
aws-partitions (1.802.0)
aws-sdk-core (3.180.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
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>Breeze</title>
<title>Butterfly</title>
<meta name="viewport" content="width=device-width,initial-scale=1">
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
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 Breeze
module Butterfly
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.0
Expand Down
2 changes: 1 addition & 1 deletion config/cable.yml
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: breeze_production
channel_prefix: butterfly_production
2 changes: 1 addition & 1 deletion config/credentials.yml.enc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
weCiYoyRRCZSJtCSfAD5TRj5L5H8WQZIas2erTkG57HoHhh3kkBhxetlTL/ui34jpeqJIsqQk0azpJfq46Wm1LZX7gCVzLCCWNCO5FoOQJ+mWQBkKrTTAaHnyEOAtjAkiYm/tidC9QkcYuClpw+oXC/rhrS77bIQ6xT8EDFLtZr2B15gQcq90yed7SLELRf71Gk8qAiMCfsboMUFswaZzGWaYPgi8YeV/Afn+psUCtdeFVfZ8JI/GEMC56WuEtdD6pcYqiVriG+XyCzHU7feDewZYCMpI7Nq6KgFujDTEGg0clpQ8wF4CYjQHVxDDK3rrJU3ZZkwIhcJeblEAL0NWiLJ8R38r2Ht8UdURLMmwp/A4ZVth5lrf1Ql1zVrHr8wg0rmBFfkuP1YSSw8IS6adIYJONep6ogUzYg1--9EOM16ho4khHOsQ0--DGh8D0nx43B1TNZ9GiqVcw==
dmK9cTYqkokvHCq6ciH+wB/LUZAe+8JLk1c9KyKn+sF7gMVXsx7ExBG13b0QbPTyenVyMl5Y01AZODm8TYFs9VeuDcw4UKdzxG4t9gvKXnSCTPXR0IU/BkGMvibgNjmmOJLTltRUo7hJKm1Dq03AkLrnAn4XXD3GqFicJE+Mc9vBqnoR8OOfPG5ZRYBSC+n+9Gs6CRat70VCZLf1HZhNbs/tu1HtqGtaj5F+r4X4yxJgoYQ1gSWLv4kAOrpmoxoXHcD29k0jINEtIl/62MD/C6zdXSGZaUuAfZjgxFeKUmRbRQ0EssEdD4g4bsdX5qIVFsWV3mNLo5y6PPtidJRv4pyjWP7cge2eUAs7nN2y3RscfNpzTglz5MDygmUnX8OWb1WulNAQoOPQ3tiRNafFy4ptb6lXyClICnfi--1UdWqKi+9VbI67Nd--4kvMsoYisWn8hacRhVeTpQ==
12 changes: 6 additions & 6 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ default: &default

development:
<<: *default
database: breeze_development
database: butterfly_development

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

# The password associated with the postgres role (username).
#password:
Expand Down Expand Up @@ -57,7 +57,7 @@ development:
# Do not set this db to the same as development or production.
test:
<<: *default
database: breeze_test
database: butterfly_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 @@ -81,6 +81,6 @@ test:
#
production:
<<: *default
database: breeze_production
username: breeze
password: <%= ENV["BREEZE_DATABASE_PASSWORD"] %>
database: butterfly_production
username: butterfly
password: <%= ENV["BUTTERFLY_DATABASE_PASSWORD"] %>
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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 = "breeze_production"
# config.active_job.queue_name_prefix = "butterfly_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 = '4e4b321003eb148bf88c10b5bd7e8f832d150e11313ac7ce8a69d3544d345807337bea6a2fe1b0e574eec35ea0c0cf7b457402ac9c47f38f5e3d9c960513f772'
# config.secret_key = 'b1e8ed72cdbe3fc6dfcdc0a8ee86cb7e6a455b477c7c0067280818de364cf09316cdb3f83e8da974e0cc25278240f4574bd999c6525a69e1189ae57862895574'

# ==> 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 = '170de24c2b12a39d0866ab64a49c428adb9ae3b0d21cb82fa9a5fe50023bf99b6e8a8cc8a7ce293069280d8172267095755bf48535ef44e3e7cd9cac05128b48'
# config.pepper = 'bb52a435259351276974ed16a4daa297e2e1c19cdd3cd6c2601a7dbe2823533116b4161cf84a04600a25a7df47be70a3784521b1cbe1d512fad87255456ca66e'

# 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.

6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,9 @@ dir-glob@^3.0.1:
path-type "^4.0.0"

electron-to-chromium@^1.4.477:
version "1.4.489"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.489.tgz#840ebe32def1ab7b3a49e876ff84c070f76154ed"
integrity sha512-QNx+cirm4ENixfdSk9rp/3HKpjlxHFsmDoHtU1IiXdkJcpkKrd/o20LT5h1f3Qz+yfTMb4Ji3YDT/IvJkNfEkA==
version "1.4.490"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz#d99286f6e915667fa18ea4554def1aa60eb4d5f1"
integrity sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==

emoji-regex@^8.0.0:
version "8.0.0"
Expand Down

0 comments on commit 45e28ee

Please sign in to comment.