diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 65b8ad685..3b2e19f8e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
-# on 2023-08-17 00:15:19 UTC using RuboCop version 1.56.0.
+# on 2023-08-18 00:14:24 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
diff --git a/Gemfile.lock b/Gemfile.lock
index c8a37968d..3173fa179 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/heartcombo/devise
- revision: ec0674523e7909579a5a008f16fb9fe0c3a71712
+ revision: 9f80dc2562524f744e8633b8562f2a0114efb32b
branch: main
specs:
devise (4.9.2)
@@ -22,7 +22,7 @@ GIT
GIT
remote: https://github.com/rails/rails.git
- revision: a844773245e96de8a47d24df76747cdc9e4aa01f
+ revision: 20c3171efb686cfcfa6c0b237a024d140d3be4e0
branch: 7-0-stable
specs:
actioncable (7.0.7)
@@ -126,7 +126,7 @@ GEM
sassc-rails (~> 2.1)
selectize-rails (~> 0.6)
aws-eventstream (1.2.0)
- aws-partitions (1.805.0)
+ aws-partitions (1.806.0)
aws-sdk-core (3.180.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
@@ -259,7 +259,7 @@ GEM
loofah (~> 2.21)
nokogiri (~> 1.14)
rake (13.0.6)
- redis-client (0.15.0)
+ redis-client (0.16.0)
connection_pool
regexp_parser (2.8.1)
reline (0.3.7)
@@ -374,4 +374,4 @@ RUBY VERSION
ruby 3.2.2p53
BUNDLED WITH
- 2.4.18
+ 2.4.19
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 6faa46302..a1dceb55e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
- Water
+ Surf
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
diff --git a/config/application.rb b/config/application.rb
index 01cd15c5f..e8ae17d2d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,7 +6,7 @@
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
-module Water
+module Surf
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.0
diff --git a/config/cable.yml b/config/cable.yml
index 29157fb47..0443346fa 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -7,4 +7,4 @@ test:
production:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
- channel_prefix: water_production
+ channel_prefix: surf_production
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index b38965c92..38f35b5e8 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-IVUjSm+qitIea6RCJHSK94eaV86A5NEL3+ojKJTZxQczn+tJk5bOodcyE4QWtOw7wlrlbSb7mS632f8VJyOiVaeF4v9sAt1g5dJYSWZB7sWV+lBJ1HD2o+SiB6rTsP6A53w03xYEtD/80TK9IYvcNDI/tYX+7XptUXv0RKIoHlpcjEd9Munu2AD/62ZPpxubtvVb0akwyO0wOfy5Ml7o9VmCJSTUQ43abJSfH1TcPgGsgK2I5AWg/SvGGhfY4JAPEUX3MDl+HG0wP/aFNqYiQtYjsGeAPRfIbeVjnixwq/pF6+WqPS29SXQgESEJQkA2g/yRHiDuUg4SX83Qvyl6PrTX2DRnWOWKFUyEl1tl2rebdBQgmzD5PTKarg8j76UzXUDWqO0kR+ajdZeDFU+ao2Jxzl8BeDI2e0Xq--RSs0/0t89klboIcF--hMOUo1QfVTnXj4wy4VeLRw==
\ No newline at end of file
+nM7qfCvFvuCRBwfIKhglzH/ByZU4XAEoMhJrngb4socyuozz2umIOh+oqKzmC+P+OwpLbQLCBQuwnN0eEIX/b2+JmAWZxYmLdp9Mu7QsXxfE9Ne8eDveO1NqlF/yNn8HM2WcLXhpEVCntMJ1QJQ/IliB9CD0AJiXty53kHQs/37bnAYOqA5uZVfvF61ey6P0Q8n7lRzA8xk0bWtPt3f9VQ15IZMlE+Z5V5pW2iLcZTWQD5pfcqWIacorwxIgz1gl2PFhnHN5QPZ8jBq94htBfw0m3iHf+4XPAG56ff9CreOmT23DrR5FjwZ9hT+RdoBhIEqMH0zvOVRgzg3Rvqq0sOFIM+Ql5OV/FCwvsWvhMM5kLJbyc8o3eru2jhziu9mk9sl2PGVNh9RlTb+JSW+gFyrkr3jCV1I6VHn7--UjRz1xlTLZZLW3lm--Yt+Wk3ijOY5qi8rGuRnahg==
\ No newline at end of file
diff --git a/config/database.yml b/config/database.yml
index ceea52501..b4bed2b17 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -23,13 +23,13 @@ default: &default
development:
<<: *default
- database: water_development
+ database: surf_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: water
+ #username: surf
# The password associated with the postgres role (username).
#password:
@@ -57,7 +57,7 @@ development:
# Do not set this db to the same as development or production.
test:
<<: *default
- database: water_test
+ database: surf_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
@@ -81,6 +81,6 @@ test:
#
production:
<<: *default
- database: water_production
- username: water
- password: <%= ENV["WATER_DATABASE_PASSWORD"] %>
+ database: surf_production
+ username: surf
+ password: <%= ENV["SURF_DATABASE_PASSWORD"] %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7dbbaf01f..1d7294b0f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -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 = "water_production"
+ # config.active_job.queue_name_prefix = "surf_production"
config.action_mailer.perform_caching = false
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 0591abb4a..88bf030e4 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -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 = '9152916dfa95a5f11a3739c765ad35f31ebaf20056945cf8d19c74d31a630a77ef19ba563d753163565256b9aab2e067f2d91921809ce00946c33133c4aef1f9'
+ # config.secret_key = '5333360389bccb68c64e5b8b20d50c18ed99aa9ab970429f402b77a36a41fbd69cad1bab6dc3897977f443fb00bbc53da75afe1182c938ac4ba072cb3cfd0a17'
# ==> Controller configuration
# Configure the parent class to the devise controllers.
@@ -126,7 +126,7 @@
config.stretches = Rails.env.test? ? 1 : 12
# Set up a pepper to generate the hashed password.
- # config.pepper = '0e0a0f8637280dfca91a25680f6f226115e9fbcb921dada37833511c46096c9141b85f5538b88ca1ae3fb0513753061abde808565822b452a5265dbf0064cf7e'
+ # config.pepper = 'c4168369d15df314c35740fec6d78e4f42d4ecda8dcd42b4ef6d74c8f1c0e62e2668b5c2c8293f9f7030f82ccd1831ea41b2632005f68cf619c272469abd3147'
# Send a notification to the original email when the user's email is changed.
# config.send_email_changed_notification = false
diff --git a/db/migrate/20230817001025_devise_create_users.rb b/db/migrate/20230818001017_devise_create_users.rb
similarity index 100%
rename from db/migrate/20230817001025_devise_create_users.rb
rename to db/migrate/20230818001017_devise_create_users.rb
diff --git a/db/migrate/20230817001503_create_flipper_tables.rb b/db/migrate/20230818001411_create_flipper_tables.rb
similarity index 100%
rename from db/migrate/20230817001503_create_flipper_tables.rb
rename to db/migrate/20230818001411_create_flipper_tables.rb
diff --git a/db/migrate/20230817001507_create_examples.rb b/db/migrate/20230818001414_create_examples.rb
similarity index 100%
rename from db/migrate/20230817001507_create_examples.rb
rename to db/migrate/20230818001414_create_examples.rb
diff --git a/db/schema.rb b/db/schema.rb
index 43a701d1d..2666e8568 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2023_08_17_001507) do
+ActiveRecord::Schema[7.0].define(version: 2023_08_18_001414) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/package.json b/package.json
index dd1d7fd3e..1ac2d2301 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"postcss-cli": "^10.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "sass": "^1.65.1"
+ "sass": "^1.66.0"
},
"scripts": {
"build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=/assets",
diff --git a/yarn.lock b/yarn.lock
index 7320cc2ab..8abf7e5fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -309,9 +309,9 @@ dir-glob@^3.0.1:
path-type "^4.0.0"
electron-to-chromium@^1.4.477:
- version "1.4.493"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.493.tgz#4654f3f806231854f457c97c4ee6db5fcf015635"
- integrity sha512-T1k9mhYPdjnmS4VAz4J1oKVn6/M6LxoqQEVtYRL0swJVj73bA2NzqF0HjwxGsW3zL3ir0oPmLfd7lyi/RYzreg==
+ version "1.4.495"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.495.tgz#d72d2eddc05d07c538275a00f2619b113848bff6"
+ integrity sha512-mwknuemBZnoOCths4GtpU/SDuVMp3uQHKa2UNJT9/aVD6WVRjGpXOxRGX7lm6ILIenTdGXPSTCTDaWos5tEU8Q==
emoji-regex@^8.0.0:
version "8.0.0"
@@ -707,10 +707,10 @@ run-parallel@^1.1.9:
dependencies:
queue-microtask "^1.2.2"
-sass@^1.65.1:
- version "1.65.1"
- resolved "https://registry.yarnpkg.com/sass/-/sass-1.65.1.tgz#8f283b0c26335a88246a448d22e1342ba2ea1432"
- integrity sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==
+sass@^1.66.0:
+ version "1.66.0"
+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.66.0.tgz#74728eed49b0e490cd729c233e7f1c6ce356e638"
+ integrity sha512-C3U+RgpAAlTXULZkWwzfysgbbBBo8IZudNAOJAVBLslFbIaZv4MBPkTqhuvpK4lqgdoFiWhnOGMoV4L1FyOBag==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"