Skip to content

Commit

Permalink
Updates for 08/12/23
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Bot committed Aug 12, 2023
1 parent 45e28ee commit 9c9ea83
Show file tree
Hide file tree
Showing 15 changed files with 155 additions and 155 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-11 00:13:54 UTC using RuboCop version 1.56.0.
# on 2023-08-12 00:15:07 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
8 changes: 4 additions & 4 deletions 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.802.0)
aws-partitions (1.803.0)
aws-sdk-core (3.180.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -171,7 +171,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (3.2.0)
faker (3.2.1)
i18n (>= 1.8.11, < 2)
ffi (1.15.5)
flipper (0.28.3)
Expand Down Expand Up @@ -235,10 +235,10 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.3)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.3-x86_64-linux)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pg (1.5.3)
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>Butterfly</title>
<title>Wind</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 Butterfly
module Wind
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: butterfly_production
channel_prefix: wind_production
2 changes: 1 addition & 1 deletion config/credentials.yml.enc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dmK9cTYqkokvHCq6ciH+wB/LUZAe+8JLk1c9KyKn+sF7gMVXsx7ExBG13b0QbPTyenVyMl5Y01AZODm8TYFs9VeuDcw4UKdzxG4t9gvKXnSCTPXR0IU/BkGMvibgNjmmOJLTltRUo7hJKm1Dq03AkLrnAn4XXD3GqFicJE+Mc9vBqnoR8OOfPG5ZRYBSC+n+9Gs6CRat70VCZLf1HZhNbs/tu1HtqGtaj5F+r4X4yxJgoYQ1gSWLv4kAOrpmoxoXHcD29k0jINEtIl/62MD/C6zdXSGZaUuAfZjgxFeKUmRbRQ0EssEdD4g4bsdX5qIVFsWV3mNLo5y6PPtidJRv4pyjWP7cge2eUAs7nN2y3RscfNpzTglz5MDygmUnX8OWb1WulNAQoOPQ3tiRNafFy4ptb6lXyClICnfi--1UdWqKi+9VbI67Nd--4kvMsoYisWn8hacRhVeTpQ==
Bdf3FVMluSeYffn95UD7ubI0fyA1nXU9JOvHKXd0A9cbWWwdjINi6ht/3h96CBCm9LR2w2te0VfBowmBto0rf5da9Li5pCW028pDfTxrQZnx305SeVaL/yUeZ7ZlL2njL4y//jitg0pCIpatXvLMNsl8ZAZDWO8KTZW/njaHKqYqe0ZPgeFvupfct7kwdKEgtEIOrtWnC6epF/C+ukfyAYIeIDHFRaj0rL0zLYHfnV9hHv0AQ+lfRnkZLIJbdBB9i6dNp5c8MKcR0zvGPh6Z18dHOjG1hmx8dygzJsDCqgCIgUEZM36tGaMTc8J5m6i/qfWcGyFezo8xpA3bZa2GGBPW7IEPf+I4EWq4klOx5iFzTNqjuuINk/Wma/6USRoNgrmJAXLHUoPZ16zkKh1whjTa/9hv3GvuTAIb--48UXVLMX+aW8LYoh--kJcjUfNXy8543HTJ58S9Pw==
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: butterfly_development
database: wind_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: butterfly
#username: wind

# 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: butterfly_test
database: wind_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: butterfly_production
username: butterfly
password: <%= ENV["BUTTERFLY_DATABASE_PASSWORD"] %>
database: wind_production
username: wind
password: <%= ENV["WIND_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 = "butterfly_production"
# config.active_job.queue_name_prefix = "wind_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 = 'b1e8ed72cdbe3fc6dfcdc0a8ee86cb7e6a455b477c7c0067280818de364cf09316cdb3f83e8da974e0cc25278240f4574bd999c6525a69e1189ae57862895574'
# config.secret_key = '986dbedc71ffb2a0cba6d27b3fdd6f7174c2ed2db49df370019b7313f820fb5e8e2fab80c6c386f5d42408a8abee053776083091596a436ee8bd9f74636fce0e'

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

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"autoprefixer": "^10.4.14",
"bootstrap": "^5.3.1",
"bootstrap-icons": "^1.10.5",
"esbuild": "^0.19.0",
"esbuild": "^0.19.1",
"nodemon": "^3.0.1",
"postcss": "^8.4.27",
"postcss-cli": "^10.1.0",
Expand Down
Loading

0 comments on commit 9c9ea83

Please sign in to comment.