From 4da1a5b569c578fe1ed366ba8efe2de28ac34234 Mon Sep 17 00:00:00 2001 From: Matt Diebolt Date: Thu, 2 Mar 2017 20:28:22 -0800 Subject: [PATCH 01/60] Add docs for restoring prod data --- README.md | 7 +++++++ script/sync-db-with-prod | 5 +++++ 2 files changed, 12 insertions(+) create mode 100755 script/sync-db-with-prod diff --git a/README.md b/README.md index 41c3c6b17..89ef185d3 100644 --- a/README.md +++ b/README.md @@ -59,3 +59,10 @@ Install all the project's dependencies with `bundle install` Create your development database `bundle exec rake db:setup` + +## Syncing your local db with prod + +1. Install the Heroku CLI +2. Log in to the CLI +3. Make sure you have added the heroku remote for this project +4. Run script/sync-db-with-prod diff --git a/script/sync-db-with-prod b/script/sync-db-with-prod new file mode 100755 index 000000000..1a739ea32 --- /dev/null +++ b/script/sync-db-with-prod @@ -0,0 +1,5 @@ +#!/bin/bash + +heroku pg:backups:download +pg_restore --clean --no-owner --dbname pixie_api_development < latest.dump +rm latest.dump From 54db36f6d18c0b34e19a71a3e136b2b44c4bceae Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Thu, 2 Mar 2017 22:56:04 -0800 Subject: [PATCH 02/60] Added width restriction in tunes collection too --- app/assets/stylesheets/_card.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_card.sass b/app/assets/stylesheets/_card.sass index 82bd7ec13..13a5bb338 100644 --- a/app/assets/stylesheets/_card.sass +++ b/app/assets/stylesheets/_card.sass @@ -4,7 +4,7 @@ card margin: 1em vertical-align: top - sprites > & + sprites > &, tunes > & width: 256px > .outline From 196e81886d257e0062ecfa7799b8742d61e9a772 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Thu, 2 Mar 2017 22:57:28 -0800 Subject: [PATCH 03/60] Removed reaxes from tunes --- app/views/tunes/_tune.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/tunes/_tune.haml b/app/views/tunes/_tune.haml index 30eb52ece..6faacdb6a 100644 --- a/app/views/tunes/_tune.haml +++ b/app/views/tunes/_tune.haml @@ -7,9 +7,6 @@ .title= link_to tune.display_title, link_path .description= markdown tune.description .actions - %a(href="#{link_path}") - = pluralize(tune.score, "Reax") - 👍 %a(href="#{link_path}") = pluralize(tune.comments_count, "Comment") 💬 From 55f2840cb643a171b72e1a869e4a10f7469ea4f4 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Fri, 3 Mar 2017 20:11:45 -0800 Subject: [PATCH 04/60] Very basic mobile header and gallery navigation --- app/assets/stylesheets/header.sass | 17 +++++++++++++++++ app/assets/stylesheets/navigation.sass | 3 +++ app/assets/stylesheets/pagination.sass | 12 +++++++++++- app/assets/stylesheets/variables.sass | 4 ++++ app/views/shared/_head.haml | 2 +- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/header.sass b/app/assets/stylesheets/header.sass index 33c2be4ca..41450dbc0 100644 --- a/app/assets/stylesheets/header.sass +++ b/app/assets/stylesheets/header.sass @@ -34,3 +34,20 @@ body > header & > img margin-left: 0.5em + + @include small + flex-direction: column + height: auto + width: 100% + + > a + width: 100% + + &:nth-child(n + 2) + padding: 0.5em 2em + + &:nth-child(1), + &:nth-child(2), + &:nth-child(4), + &:nth-child(6) + display: none diff --git a/app/assets/stylesheets/navigation.sass b/app/assets/stylesheets/navigation.sass index 8f1d17293..9cb58fe7b 100644 --- a/app/assets/stylesheets/navigation.sass +++ b/app/assets/stylesheets/navigation.sass @@ -3,3 +3,6 @@ content > nav > * margin-right: 1em + + @include small + flex-direction: column diff --git a/app/assets/stylesheets/pagination.sass b/app/assets/stylesheets/pagination.sass index c345cf55d..ccc65d802 100644 --- a/app/assets/stylesheets/pagination.sass +++ b/app/assets/stylesheets/pagination.sass @@ -10,11 +10,12 @@ border: 1px solid $primary-color border-left-width: 0 color: $primary-color - flex: none + flex: 0 1 auto font-weight: bold line-height: 34px padding: 0 14px text-decoration: none + white-space: nowrap &:first-child border-bottom-left-radius: 3px @@ -33,5 +34,14 @@ color: white background: $primary-color + @include small + display: none + + &:first-child, &:last-child + display: block + & > ul padding: 0 + + @include small + margin: 1em 0 0 diff --git a/app/assets/stylesheets/variables.sass b/app/assets/stylesheets/variables.sass index 3b05c8f4c..f1b79683e 100644 --- a/app/assets/stylesheets/variables.sass +++ b/app/assets/stylesheets/variables.sass @@ -16,3 +16,7 @@ $light-divider-color: rgba(255, 255, 255, 0.12) $item-shadow: 1px 1px 3px rgba(0, 0, 0, 0.5) $control-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5) + +@mixin small + @media (max-width: 767px) + @content diff --git a/app/views/shared/_head.haml b/app/views/shared/_head.haml index 080e464bd..241316f50 100644 --- a/app/views/shared/_head.haml +++ b/app/views/shared/_head.haml @@ -6,7 +6,7 @@ %meta{ 'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8' } %meta{ :name => "description", :content => (@meta_desc || "This free online pixel editor is amazingly simple. Build on the work of others and share your creations, or start fresh and create something new.") } - + = csrf_meta_tag = stylesheet_link_tag 'screen', :media => 'screen, projection' From d966a725fbf3457dc90e37df4606f17f6e45e1e0 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sat, 4 Mar 2017 11:33:39 -0800 Subject: [PATCH 05/60] Mobile form views --- app/assets/stylesheets/_card.sass | 4 ++++ app/assets/stylesheets/form.sass | 9 ++++++++- app/views/users/new.haml | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/_card.sass b/app/assets/stylesheets/_card.sass index 13a5bb338..cfc63d8df 100644 --- a/app/assets/stylesheets/_card.sass +++ b/app/assets/stylesheets/_card.sass @@ -7,6 +7,10 @@ card sprites > &, tunes > & width: 256px + @include small + margin: 1em 0 0 + width: 100% + > .outline box-shadow: $item-shadow border-radius: 4px diff --git a/app/assets/stylesheets/form.sass b/app/assets/stylesheets/form.sass index f0356e4a6..eaedc3594 100644 --- a/app/assets/stylesheets/form.sass +++ b/app/assets/stylesheets/form.sass @@ -20,7 +20,7 @@ form display: block margin-bottom: 1em - > input[type="text"] + > input[type="text"], > input[type="password"] width: 100% > textarea @@ -100,6 +100,13 @@ form.primary color: $primary-color font-size: 2em + @include small + margin-left: 0 + width: 100% + + > button.cta + width: 100% + label > h3 display: inline diff --git a/app/views/users/new.haml b/app/views/users/new.haml index 06a641cc7..c1e337fdc 100644 --- a/app/views/users/new.haml +++ b/app/views/users/new.haml @@ -31,9 +31,9 @@ unless newVal is val $this.val(newVal) -= form_for user, :html => { :class => "module" } do |form| += form_for user, html: { class: "primary" } do |form| = form.error_messages - %h2 Sign up for Pixie! + %h1 Sign up for Pixie! %label %h3 Display Name @@ -45,4 +45,4 @@ %h3 Password = form.password_field :password - %button.btn.full Sign Up + %button.cta Sign Up From 8733cc2823b8f84ac641805a1e1255c8541d093e Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sat, 4 Mar 2017 12:00:52 -0800 Subject: [PATCH 06/60] Reduce extra margin on first card in mobile view --- app/assets/stylesheets/_card.sass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/_card.sass b/app/assets/stylesheets/_card.sass index cfc63d8df..7518e1034 100644 --- a/app/assets/stylesheets/_card.sass +++ b/app/assets/stylesheets/_card.sass @@ -11,6 +11,9 @@ card margin: 1em 0 0 width: 100% + &:first-child + margin-top: 0 + > .outline box-shadow: $item-shadow border-radius: 4px From 22c4dfad39add0d758171ac7463c1e6ab1d37b4a Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sat, 4 Mar 2017 13:12:42 -0800 Subject: [PATCH 07/60] Meta keywords and description updates --- app/controllers/sprites_controller.rb | 8 +++++++- app/controllers/users_controller.rb | 6 +++++- app/models/sprite.rb | 12 ++++++++---- app/views/shared/_head.haml | 4 +++- app/views/sprites/show.haml | 1 - app/views/users/show.haml | 12 ------------ 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/controllers/sprites_controller.rb b/app/controllers/sprites_controller.rb index 359a39f1b..b99623bf6 100644 --- a/app/controllers/sprites_controller.rb +++ b/app/controllers/sprites_controller.rb @@ -84,6 +84,10 @@ def index end def show + @meta_description = sprite.description + @meta_keywords = sprite.tag_list.join(",") + @meta_author = sprite.creator_name + respond_with(sprite) do |format| format.json { render :json } end @@ -204,7 +208,9 @@ def collection t.taggings_count >= 5 end - logger.info @tag_counts + @meta_keywords = @tag_counts.join(",") + @meta_author = "Various" + @meta_description = items.map(&:title).compact.join(" ") @collection = items diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e83dfd085..b6c2e9991 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -114,7 +114,9 @@ def create end def show - @title = "#{user.display_name} - PixieEngine Game Creation Toolset" + @title = "#{user.display_name} - Pixie Engine" + @meta_author = user.display_name + @meta_description = user.profile if user == current_user @activity_updates = user.activity_updates @@ -125,6 +127,8 @@ def show end @sprites = Sprite.for_user(user).order("id DESC").page(params[:page]).per_page(32) + + @meta_keywords = @sprites.tag_counts.join(",") end def edit diff --git a/app/models/sprite.rb b/app/models/sprite.rb index 6102580b8..09910b905 100644 --- a/app/models/sprite.rb +++ b/app/models/sprite.rb @@ -58,6 +58,14 @@ class Sprite < ActiveRecord::Base end } + def creator_name + if user + user.display_name + else + "Anonymous" + end + end + def display_name if title.blank? "Sprite #{id}" @@ -127,10 +135,6 @@ def replay_path "#{base_path}replays/#{id}.json" end - def meta_desc - "#{tag_list.join(' ')} #{title} #{dimension_list.join(' ')} #{description}" - end - def migrate_image_attachment update_attribute(:image, File.open(file_path)) end diff --git a/app/views/shared/_head.haml b/app/views/shared/_head.haml index 241316f50..3d03e0c13 100644 --- a/app/views/shared/_head.haml +++ b/app/views/shared/_head.haml @@ -4,7 +4,9 @@ = @title Pixie Engine - Create! %meta{ 'http-equiv' => 'Content-Type', :content => 'text/html; charset=utf-8' } - %meta{ :name => "description", :content => (@meta_desc || "This free online pixel editor is amazingly simple. Build on the work of others and share your creations, or start fresh and create something new.") } + %meta{ :name => "description", :content => (@meta_description || "This free online pixel editor is amazingly simple. Build on the work of others and share your creations, or start fresh and create something new.") } + %meta{ :name => "keywords", :content => (@meta_keywords || "online, pixel, editor, sprite, free, games") } + %meta{ :name => "author", :content => (@meta_author || "Daniel X. Moore") } = csrf_meta_tag diff --git a/app/views/sprites/show.haml b/app/views/sprites/show.haml index 873ab6db9..f432f374c 100644 --- a/app/views/sprites/show.haml +++ b/app/views/sprites/show.haml @@ -1,5 +1,4 @@ - @title = sprite.display_name -- @meta_desc = sprite.meta_desc %section.derivation = render :partial => sprite, :locals => {link_path: load_sprite_path(sprite)} diff --git a/app/views/users/show.haml b/app/views/users/show.haml index 2f2f420b5..3eeb69aee 100644 --- a/app/views/users/show.haml +++ b/app/views/users/show.haml @@ -1,15 +1,3 @@ -- unless user.profile.blank? - - @meta_desc = user.profile.html_safe - -:sass - body > .content - padding: 0.5em 2em - padding-top: 40px - - .sprites_gallery - .header - padding-top: 0 - %section.profile>< %h1>< = user.display_name From 01bbe9863caca4fe1ef460389f154401483b7e82 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sat, 4 Mar 2017 16:33:56 -0800 Subject: [PATCH 08/60] Twerkin the tag stylz --- app/assets/stylesheets/tags.sass | 39 ++++++++++++++++++++----------- app/helpers/application_helper.rb | 2 +- app/views/sprites/_tag.haml | 2 -- 3 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 app/views/sprites/_tag.haml diff --git a/app/assets/stylesheets/tags.sass b/app/assets/stylesheets/tags.sass index 07b8ccb2e..4a5396d0c 100644 --- a/app/assets/stylesheets/tags.sass +++ b/app/assets/stylesheets/tags.sass @@ -2,22 +2,35 @@ tags align-items: center display: flex flex-wrap: wrap - margin-bottom: 1em + margin-bottom: 1rem - > tag - align-items: center - display: flex + > * + margin: 0 0.25rem - > a - background-color: $secondary-accent-color - border-radius: 4px - color: $light-text-color - font-size: 0.8em - font-weight: bold - padding: 1px 7px + &:first-child + margin-left: 0 - > * - margin: 0 0.25em 0.25em 0 + > a + background-color: $secondary-accent-color + color: $light-text-color + font-size: 0.8rem + font-weight: bold + padding: 1px 7px 1px 9px + position: relative + + &:before, &:after + content: "" + position: absolute + border-right: 6px solid transparent + left: 0 + + &:before + border-top: 6px solid white + top: 0 + + &:after + border-bottom: 6px solid white + bottom: 0 > form display: flex diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bc664f0d0..a36c2f20a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -26,7 +26,7 @@ def markdown(text) end def tag_link(tag) - render :partial => "sprites/tag", :object => tag + link_to tag, action: :index, tagged: tag end def display_comments(commentable) diff --git a/app/views/sprites/_tag.haml b/app/views/sprites/_tag.haml deleted file mode 100644 index dc1eea463..000000000 --- a/app/views/sprites/_tag.haml +++ /dev/null @@ -1,2 +0,0 @@ -%tag - = link_to tag, action: :index, tagged: tag From 6583266b80865fc4f8fa15e6f4834923bc3eb978 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sat, 4 Mar 2017 17:55:20 -0800 Subject: [PATCH 09/60] Titles touch up --- app/controllers/sprites_controller.rb | 1 + app/controllers/users_controller.rb | 2 +- app/views/sprites/show.haml | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/sprites_controller.rb b/app/controllers/sprites_controller.rb index b99623bf6..165729a08 100644 --- a/app/controllers/sprites_controller.rb +++ b/app/controllers/sprites_controller.rb @@ -84,6 +84,7 @@ def index end def show + @title = sprite.display_name @meta_description = sprite.description @meta_keywords = sprite.tag_list.join(",") @meta_author = sprite.creator_name diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b6c2e9991..f072aa523 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -114,7 +114,7 @@ def create end def show - @title = "#{user.display_name} - Pixie Engine" + @title = user.display_name @meta_author = user.display_name @meta_description = user.profile diff --git a/app/views/sprites/show.haml b/app/views/sprites/show.haml index f432f374c..e9aeeada5 100644 --- a/app/views/sprites/show.haml +++ b/app/views/sprites/show.haml @@ -1,5 +1,3 @@ -- @title = sprite.display_name - %section.derivation = render :partial => sprite, :locals => {link_path: load_sprite_path(sprite)} From b7c7a84b7c9fc9cb2523392ae5d1d04b106bbb38 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sat, 4 Mar 2017 21:47:57 -0800 Subject: [PATCH 10/60] Password forms --- app/views/password_resets/edit.haml | 4 ++-- app/views/password_resets/new.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/password_resets/edit.haml b/app/views/password_resets/edit.haml index 716614a25..419a53dbc 100644 --- a/app/views/password_resets/edit.haml +++ b/app/views/password_resets/edit.haml @@ -1,4 +1,4 @@ -= form_for @user, :html => { :class => "module" }, :url => password_reset_path, :method => :put do |form| += form_for @user, html: { class: "primary" }, url: password_reset_path, method: :put do |form| = form.error_messages %h1 Change Password @@ -7,4 +7,4 @@ %h3 New Password = form.password_field :password - %button.full Update my Password + %button.cta Update my Password diff --git a/app/views/password_resets/new.haml b/app/views/password_resets/new.haml index e57cea2bd..a2837c914 100644 --- a/app/views/password_resets/new.haml +++ b/app/views/password_resets/new.haml @@ -1,4 +1,4 @@ -=form_tag password_resets_path, :class => "module" do +=form_tag password_resets_path, class: "primary" do %h1 Forgot Password %p Enter your email address and instructions on how to reset your password will be mailed to you. @@ -7,4 +7,4 @@ %h3 Email = text_field_tag :email - %button.btn.full Reset my password + %button.cta Reset my password From 40685d2382d691bb81776f84aa3ed7b8c972028e Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sun, 5 Mar 2017 11:28:42 -0800 Subject: [PATCH 11/60] User table cleanup --- app/controllers/users_controller.rb | 2 +- app/models/user.rb | 14 +++--- app/views/notifier/forgot_password.haml | 8 +++ app/views/notifier/forgot_password.text.haml | 8 --- .../20170305171646_update_users_table.rb | 50 +++++++++++++++++++ db/schema.rb | 14 +++--- test/mailers/previews/notifier_preview.rb | 4 ++ 7 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 app/views/notifier/forgot_password.haml delete mode 100644 app/views/notifier/forgot_password.text.haml create mode 100644 db/migrate/20170305171646_update_users_table.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f072aa523..b9ee848f8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -171,7 +171,7 @@ def do_unsubscribe private def user_params - params[:user].permit([:avatar, :display_name, :email, :password, :profile, :favorite_color, :forum_notifications, :site_notifications, :help_tips]) + params[:user].permit([:avatar, :display_name, :email, :password, :profile, :favorite_color, :site_notifications]) end def collection diff --git a/app/models/user.rb b/app/models/user.rb index 2c3e05323..7a3a51ff1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,8 +1,12 @@ class User < ActiveRecord::Base validates :display_name, - :format => { :with => /\A[A-Za-z0-9_-]+\Z/ }, - :presence => true, - :uniqueness => true + format: { :with => /\A[A-Za-z0-9_-]+\Z/ }, + presence: true, + uniqueness: { case_sensitive: false }, + length: { maximum: 45 } + + validates :email, + length: { maximum: 254 } acts_as_authentic do |config| config.validate_email_field :no_connected_sites? @@ -23,7 +27,7 @@ class User < ActiveRecord::Base } ) - validates_attachment_content_type :avatar, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif"] + validates_attachment_content_type :avatar, :content_type => [/\Aimage\/.*\Z/] include Commentable @@ -51,8 +55,6 @@ class User < ActiveRecord::Base has_many :authored_comments, :class_name => "Comment", :foreign_key => "commenter_id" - # attr_accessible :avatar, :display_name, :email, :password, :profile, :favorite_color, :forum_notifications, :site_notifications, :help_tips - scope :online_now, lambda { where("last_request_at >= ?", Time.zone.now - 15.minutes) } diff --git a/app/views/notifier/forgot_password.haml b/app/views/notifier/forgot_password.haml new file mode 100644 index 000000000..335430658 --- /dev/null +++ b/app/views/notifier/forgot_password.haml @@ -0,0 +1,8 @@ +%p + A request to reset your password has been made. To reset your password click the link below: + +%p + = link_to "Reset Password", edit_password_reset_url(@user.perishable_token) + +%p + If you did not make this request you can safely ignore this email. diff --git a/app/views/notifier/forgot_password.text.haml b/app/views/notifier/forgot_password.text.haml deleted file mode 100644 index 842cd4733..000000000 --- a/app/views/notifier/forgot_password.text.haml +++ /dev/null @@ -1,8 +0,0 @@ -A request to reset your password has been made. -If you did not make this request, simply ignore this email. -If you did make this request just click the link below: - -= edit_password_reset_url(@user.perishable_token) - -If the above URL does not work try copying and pasting it into your browser. -If you continue to have problem please feel free to contact us. diff --git a/db/migrate/20170305171646_update_users_table.rb b/db/migrate/20170305171646_update_users_table.rb new file mode 100644 index 000000000..0f80164bb --- /dev/null +++ b/db/migrate/20170305171646_update_users_table.rb @@ -0,0 +1,50 @@ +class UpdateUsersTable < ActiveRecord::Migration[5.0] + def change + enable_extension 'citext' + + User.delete([ + 9, + 10, + 98, + 757, + 842, + 1102, + 1103, + 1113, + 1194, + 1496, + 1627, + 1707, + 1745, + 3341, + 4569, + ]) + + duplicate_names = User.select("LOWER(display_name) AS disp").group("LOWER(display_name)").having("count(*) > 1").map(&:disp) + User.select("LOWER(display_name) AS disp", :id, :display_name).where(["LOWER(display_name) in (?)", duplicate_names]).group_by do |u| + u.display_name.downcase + end.map do |name, user_set| + user_set.sort_by(&:id) + end.each do |user_set| + # First guy gets to keep + user_set.shift + # Rest get a suffix + user_set.each do |user| + user.update_column(:display_name, "#{user.display_name}-#{user.id}") + end + end + + remove_column :users, "paying", :boolean, default: false, null: false + remove_column :users, "forem_admin", :boolean, default: false, null: false + remove_column :users, "forum_notifications", :booloan, default: true, null: false + remove_column :users, "help_tips", :boolean, default: true, null: false + remove_column :users, "spreedly_token", :string, limit: 255 + + change_column :users, :email, :citext, null: false + change_column :users, :display_name, :citext, null: false + + add_index :users, :email, unique: true + add_index :users, :perishable_token, unique: true + + end +end diff --git a/db/schema.rb b/db/schema.rb index 593a441de..af23e1497 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,10 +10,11 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170218165816) do +ActiveRecord::Schema.define(version: 20170305171646) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + enable_extension "citext" create_table "activities", force: :cascade do |t| t.integer "trackable_id" @@ -183,7 +184,7 @@ end create_table "users", force: :cascade do |t| - t.string "email", limit: 255 + t.citext "email", null: false t.string "crypted_password", limit: 255 t.string "password_salt", limit: 255 t.string "persistence_token", limit: 255, null: false @@ -198,7 +199,7 @@ t.string "last_login_ip", limit: 255 t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.string "display_name", limit: 255 + t.citext "display_name", null: false t.integer "referrer_id" t.string "oauth_secret", limit: 255 t.integer "active_token_id" @@ -211,17 +212,14 @@ t.datetime "avatar_updated_at" t.boolean "subscribed", default: true, null: false t.string "favorite_color", limit: 255 - t.boolean "paying", default: false, null: false - t.boolean "forem_admin", default: false, null: false - t.boolean "forum_notifications", default: true, null: false t.boolean "site_notifications", default: true, null: false - t.boolean "help_tips", default: true, null: false - t.string "spreedly_token", limit: 255 t.datetime "last_contacted", default: '2011-12-29 01:37:27', null: false t.datetime "last_surveyed", default: '2009-12-29 02:38:45', null: false t.integer "followers_count", default: 0, null: false t.integer "following_count", default: 0, null: false t.index ["display_name"], name: "index_users_on_display_name", unique: true, using: :btree + t.index ["email"], name: "index_users_on_email", unique: true, using: :btree + t.index ["perishable_token"], name: "index_users_on_perishable_token", unique: true, using: :btree end add_foreign_key "tunes", "users" diff --git a/test/mailers/previews/notifier_preview.rb b/test/mailers/previews/notifier_preview.rb index 44225b450..278014223 100644 --- a/test/mailers/previews/notifier_preview.rb +++ b/test/mailers/previews/notifier_preview.rb @@ -11,4 +11,8 @@ def invite def comment Notifier.comment(Comment.last) end + + def forgot + Notifier.forgot_password(User.first) + end end From 567aeca883dd9f6ee125eb33c55e0ca4817cc41c Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Sun, 5 Mar 2017 12:45:09 -0800 Subject: [PATCH 12/60] Flash notice and form error styling, better redirect handling on user login --- app/assets/stylesheets/animations.sass | 9 +++++++++ app/assets/stylesheets/base.sass | 1 + app/assets/stylesheets/errors.sass | 6 ++++++ app/assets/stylesheets/flash.sass | 20 +++++++++++++++++++ app/assets/stylesheets/form.sass | 4 ++++ app/assets/stylesheets/screen.sass | 3 +++ app/controllers/application_controller.rb | 10 +++++++--- app/views/layouts/application.haml | 7 ++++--- .../shared/{_flashes.haml => _flash.haml} | 2 +- app/views/shared/_footer.haml | 3 +-- config/initializers/customize_errors.rb | 9 +++++++++ 11 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 app/assets/stylesheets/animations.sass create mode 100644 app/assets/stylesheets/errors.sass create mode 100644 app/assets/stylesheets/flash.sass rename app/views/shared/{_flashes.haml => _flash.haml} (85%) create mode 100644 config/initializers/customize_errors.rb diff --git a/app/assets/stylesheets/animations.sass b/app/assets/stylesheets/animations.sass new file mode 100644 index 000000000..6e3c89df5 --- /dev/null +++ b/app/assets/stylesheets/animations.sass @@ -0,0 +1,9 @@ +@keyframes slide-in-and-out-from-left + 0% + right: 110% + 12.5% + right: -1em + 87.5% + right: -1em + 100% + right: 110% diff --git a/app/assets/stylesheets/base.sass b/app/assets/stylesheets/base.sass index 7b6ec0632..490dafe0c 100644 --- a/app/assets/stylesheets/base.sass +++ b/app/assets/stylesheets/base.sass @@ -18,6 +18,7 @@ body > content display: block padding: 0 1em + position: relative &#fullscreen overflow: hidden diff --git a/app/assets/stylesheets/errors.sass b/app/assets/stylesheets/errors.sass new file mode 100644 index 000000000..1413f671c --- /dev/null +++ b/app/assets/stylesheets/errors.sass @@ -0,0 +1,6 @@ +#errorExplanation + border-radius: 4px + border: 2px solid red + box-shadow: $item-shadow + color: red + padding: 0 1em diff --git a/app/assets/stylesheets/flash.sass b/app/assets/stylesheets/flash.sass new file mode 100644 index 000000000..74461cbea --- /dev/null +++ b/app/assets/stylesheets/flash.sass @@ -0,0 +1,20 @@ +#flash + display: flex + left: 0 + overflow: hidden + padding: 1em + pointer-events: none + position: absolute + top: -1em + + > * + animation-duration: 5s + animation-name: slide-in-and-out-from-left + background-color: white + border-radius: 4px + border: 1px solid green + box-shadow: $item-shadow + color: green + right: 110% + padding: 1em + position: relative diff --git a/app/assets/stylesheets/form.sass b/app/assets/stylesheets/form.sass index eaedc3594..79f33b1e2 100644 --- a/app/assets/stylesheets/form.sass +++ b/app/assets/stylesheets/form.sass @@ -99,6 +99,7 @@ form.primary > h1 color: $primary-color font-size: 2em + margin-top: 0 @include small margin-left: 0 @@ -124,3 +125,6 @@ input &::-webkit-color-swatch border: none padding: 0 + +input.error + border: 2px solid red diff --git a/app/assets/stylesheets/screen.sass b/app/assets/stylesheets/screen.sass index 42867c733..5421cc690 100644 --- a/app/assets/stylesheets/screen.sass +++ b/app/assets/stylesheets/screen.sass @@ -3,10 +3,13 @@ @import variables @import base +@import animations @import button @import card @import creator @import comments +@import errors +@import flash @import form @import header @import image diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6ceb0d9cd..ac354746a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -21,7 +21,7 @@ def current_user def require_user unless current_user store_location - redirect_to sign_in_path, :notice => "You must be logged in to access this page" + redirect_to sign_in_path, :notice => "You must log in to access this page" return false end end @@ -29,7 +29,7 @@ def require_user def require_no_user if current_user store_location - redirect_to root_url, :notice => "You must be logged out to access this page" + redirect_to root_url, :notice => "You must log out to access this page" end end @@ -95,7 +95,11 @@ def save_sprites_to_user(user) end def store_location - session[:return_to] = request.fullpath + if request.method == "GET" + session[:return_to] = request.fullpath + else + session[:return_to]= request.referer + end end def redirect_back_or_default(default) diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 5af718bc4..3df1c92fa 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -1,13 +1,14 @@ %html - = render :partial => "shared/head" + = render partial: "shared/head" - body_id = @fullscreen ? "fullscreen" : nil %body(id=body_id eventCategory="Body")>< - = render :partial => "shared/header" + = render partial: "shared/header" - event_category = "#{controller.controller_name} #{controller.action_name}" %content(eventCategory=event_category)>< = yield - = render :partial => "shared/footer" + = render partial: "shared/flash" + = render partial: "shared/footer" diff --git a/app/views/shared/_flashes.haml b/app/views/shared/_flash.haml similarity index 85% rename from app/views/shared/_flashes.haml rename to app/views/shared/_flash.haml index e46363cbf..a0abdd5c0 100644 --- a/app/views/shared/_flashes.haml +++ b/app/views/shared/_flash.haml @@ -1,3 +1,3 @@ -#flashes> +#flash - flash.each do |key, msg| %div{ :class => key }= msg diff --git a/app/views/shared/_footer.haml b/app/views/shared/_footer.haml index 3f6f125cc..4e7faabda 100644 --- a/app/views/shared/_footer.haml +++ b/app/views/shared/_footer.haml @@ -1,4 +1,3 @@ -%footer.navbar.navbar-fixed-bottom +%footer = render :partial => "/shared/feedback" - = render :partial => "/shared/javascripts" diff --git a/config/initializers/customize_errors.rb b/config/initializers/customize_errors.rb new file mode 100644 index 000000000..a21e2796c --- /dev/null +++ b/config/initializers/customize_errors.rb @@ -0,0 +1,9 @@ +ActionView::Base.field_error_proc = Proc.new do |html_tag, instance| + class_attr_index = html_tag.index 'class="' + + if class_attr_index + html_tag.insert class_attr_index+7, 'error ' + else + html_tag.insert html_tag.index('>'), ' class="error"' + end +end From c9316d7dab32170e238492dfbe06f0c360b6fb15 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Thu, 9 Mar 2017 17:05:18 -0800 Subject: [PATCH 13/60] Added citext support --- config/initializers/rails_admin.rb | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index 357a41ddc..f6472b65d 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -1,3 +1,40 @@ +# citext support https://github.com/sferik/rails_admin/issues/2177 +require 'rails_admin/config/fields/base' + +module RailsAdmin + module Config + module Fields + module Types + class Citext < RailsAdmin::Config::Fields::Types::String + RailsAdmin::Config::Fields::Types::register(:citext, self) + end + end + end + end + + # Allow for searching/filtering of `citext` fields. + module Adapters + module ActiveRecord + module CitextStatement + private + + def build_statement_for_type + if @type == :citext + return build_statement_for_string_or_text + else + super + end + end + end + + class StatementBuilder < RailsAdmin::AbstractModel::StatementBuilder + prepend CitextStatement + end + end + end +end + + RailsAdmin.config do |config| config.parent_controller = "::ApplicationController" From 05d38c7d236177ef358aa64626a5c20821f4c9a9 Mon Sep 17 00:00:00 2001 From: Daniel X Moore Date: Fri, 9 Feb 2018 12:17:53 -0800 Subject: [PATCH 14/60] Load in editor should appear for all users --- app/views/tunes/show.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/tunes/show.haml b/app/views/tunes/show.haml index d10eb85e8..017953880 100644 --- a/app/views/tunes/show.haml +++ b/app/views/tunes/show.haml @@ -13,6 +13,9 @@ %button(type='submit') Add Tag %actions + %a.button(href="#{editor_tune_path(tune)}") + ⬆️️ Load in Editor + - if current_user - if current_user.favorite?(tune) = button_to remove_favorite_tune_path(tune) do @@ -22,8 +25,6 @@ 💝 Add Favorite - if owner_or_admin? - %a.button(href="#{editor_tune_path(tune)}") - ⬆️️ Load in Editor %a.button(href="#{edit_tune_path(tune)}") 📝 Edit Details %a.button(href="#{tune_path(tune)}" data-method="delete") From db3679989bc747ccd66df54d1bf3ab26b2e23ec8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2019 09:50:34 -0700 Subject: [PATCH 15/60] Bump sanitize from 4.4.0 to 4.6.3 (#284) Bumps [sanitize](https://github.com/rgrove/sanitize) from 4.4.0 to 4.6.3. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v4.4.0...v4.6.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ef2cf487b..80e069e6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.0.4) connection_pool (2.2.1) - crass (1.0.2) + crass (1.0.5) debug_inspector (0.0.2) dotenv (2.2.0) dotenv-rails (2.2.0) @@ -137,15 +137,15 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_portile2 (2.1.0) + mini_portile2 (2.4.0) minitest (5.10.1) mocha (1.2.1) metaclass (~> 0.0.1) nested_form (0.3.2) nio4r (1.2.1) - nokogiri (1.7.0.1) - mini_portile2 (~> 2.1.0) - nokogumbo (1.4.10) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) + nokogumbo (1.5.0) nokogiri paperclip (5.1.0) activemodel (>= 4.2.0) @@ -226,10 +226,10 @@ GEM rmagick (2.16.0) ruby_parser (3.8.4) sexp_processor (~> 4.1) - sanitize (4.4.0) + sanitize (4.6.3) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) + nokogumbo (~> 1.4) sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) From 196d9bedeb54c4f237af79d27ecb0e892e0d147c Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 20:14:39 -0800 Subject: [PATCH 16/60] Updated rmagick and nokogiri --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 80e069e6d..728e6ad1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM metaclass (~> 0.0.1) nested_form (0.3.2) nio4r (1.2.1) - nokogiri (1.10.4) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -223,7 +223,7 @@ GEM request_store (1.3.2) responders (2.3.0) railties (>= 4.2.0, < 5.1) - rmagick (2.16.0) + rmagick (4.0.0) ruby_parser (3.8.4) sexp_processor (~> 4.1) sanitize (4.6.3) From 92b1d617106dff8741f9726fc817cbbbcf4d7c58 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 20:28:08 -0800 Subject: [PATCH 17/60] No anons in favs or recents until better moderation --- app/controllers/sprites_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/sprites_controller.rb b/app/controllers/sprites_controller.rb index 165729a08..c1635554f 100644 --- a/app/controllers/sprites_controller.rb +++ b/app/controllers/sprites_controller.rb @@ -200,6 +200,7 @@ def collection items = items .order(order) .where(["sprites.created_at > '%s'", recency]) + .where.not(user_id: nil) .includes(:taggings) .search(params[:search]) .page(params[:page]) From dd8313da5a5ae3c4272fc89550a37147bb844a07 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 20:35:09 -0800 Subject: [PATCH 18/60] dep up --- Gemfile.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 728e6ad1b..1a808ce1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - ffi (1.9.17) + ffi (1.12.1) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -213,7 +213,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (13.0.1) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) @@ -237,9 +237,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - scrypt (3.0.3) - ffi-compiler (>= 1.0.0) - rake + scrypt (3.0.7) + ffi-compiler (>= 1.0, < 2.0) sexp_processor (4.8.0) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) From 8ecc671571cf38e172f5a05d455c5abd13735f51 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 20:49:16 -0800 Subject: [PATCH 19/60] Updated ruby version --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c9e10f31e..f96830ff5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '2.4.0' +ruby '2.4.9' source 'https://rubygems.org' git_source(:github) do |repo_name| diff --git a/Gemfile.lock b/Gemfile.lock index 1a808ce1b..2c36b6536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -327,7 +327,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.4.0p0 + ruby 2.4.9p362 BUNDLED WITH - 1.14.3 + 1.17.3 From aa05c84fcb2a2916b0fa0a262643645290893601 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 20:53:45 -0800 Subject: [PATCH 20/60] Updated puma --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2c36b6536..77387a92e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM activerecord (>= 3.0) i18n (>= 0.5.0) railties (>= 3.0.0) - puma (3.7.0) + puma (3.12.2) rack (2.0.1) rack-cors (0.4.1) rack-pjax (1.0.0) From 0dc5670b0bad26847e6dd4c51bda67b9b823fc53 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 20:54:53 -0800 Subject: [PATCH 21/60] Updated rack --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 77387a92e..c86e1763b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM i18n (>= 0.5.0) railties (>= 3.0.0) puma (3.12.2) - rack (2.0.1) + rack (2.1.1) rack-cors (0.4.1) rack-pjax (1.0.0) nokogiri (~> 1.5) From e249080762e50ed4ef08940ec4863136242fac94 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 21:09:51 -0800 Subject: [PATCH 22/60] Updated deps --- Gemfile.lock | 204 +++++++++++++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 89 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c86e1763b..07282f86b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,45 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.1) - actionpack (= 5.0.1) - nio4r (~> 1.2) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) + nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.1) - actionpack (= 5.0.1) - actionview (= 5.0.1) - activejob (= 5.0.1) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.1) - actionview (= 5.0.1) - activesupport (= 5.0.1) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.1) - activesupport (= 5.0.1) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.1) - activesupport (= 5.0.1) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) globalid (>= 0.3.6) - activemodel (5.0.1) - activesupport (= 5.0.1) - activerecord (5.0.1) - activemodel (= 5.0.1) - activesupport (= 5.0.1) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) arel (~> 7.0) - activesupport (5.0.1) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) acts-as-taggable-on (4.0.0) @@ -54,20 +58,18 @@ GEM aws-sdk-resources (2.7.9) aws-sdk-core (= 2.7.9) aws-sigv4 (1.0.0) - builder (3.2.3) + builder (3.2.4) byebug (9.0.6) chronic (0.10.2) - climate_control (0.1.0) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.2.1) + climate_control (0.2.0) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.4) + concurrent-ruby (1.1.5) connection_pool (2.2.1) crass (1.0.5) debug_inspector (0.0.2) @@ -93,12 +95,10 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - font-awesome-rails (4.7.0.1) - railties (>= 3.2, < 5.1) foreman (0.83.0) thor (~> 0.19.1) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.2) + activesupport (>= 4.2.0) haml (4.0.7) tilt haml-rails (0.9.0) @@ -112,47 +112,59 @@ GEM haml (~> 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (0.8.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) jmespath (1.3.1) - jquery-rails (4.2.2) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.0.3) + loofah (2.4.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.1) + mini_mime (>= 0.1.1) memoist (0.15.0) metaclass (0.0.4) - method_source (0.8.2) - mime-types (3.1) + method_source (0.9.2) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) + mime-types-data (3.2019.1009) + mimemagic (0.3.3) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.10.1) + minitest (5.14.0) mocha (1.2.1) metaclass (~> 0.0.1) nested_form (0.3.2) - nio4r (1.2.1) + nio4r (2.5.2) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri - paperclip (5.1.0) + paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) pg (0.19.0) pg_search (2.0.1) activerecord (>= 4.2) @@ -165,51 +177,51 @@ GEM railties (>= 3.0.0) puma (3.12.2) rack (2.1.1) - rack-cors (0.4.1) - rack-pjax (1.0.0) + rack-cors (1.1.1) + rack (>= 2.0.0) + rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.8.1) rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.1) - actioncable (= 5.0.1) - actionmailer (= 5.0.1) - actionpack (= 5.0.1) - actionview (= 5.0.1) - activejob (= 5.0.1) - activemodel (= 5.0.1) - activerecord (= 5.0.1) - activesupport (= 5.0.1) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.1) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) + bundler (>= 1.3.0) + railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.1) actionpack (~> 5.x) actionview (~> 5.x) activesupport (~> 5.x) - rails-dom-testing (2.0.2) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - rails_admin (1.1.1) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + rails_admin (2.0.1) + activemodel-serializers-xml (>= 1.0) builder (~> 3.1) - coffee-rails (~> 4.0) - font-awesome-rails (>= 3.0, < 5) - haml (~> 4.0) + haml (>= 4.0, < 6) jquery-rails (>= 3.0, < 5) - jquery-ui-rails (~> 5.0) - kaminari (~> 0.14) + jquery-ui-rails (>= 5.0, < 7) + kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) rack-pjax (>= 0.7) - rails (>= 4.0, < 6) + rails (>= 5.0, < 7) remotipart (~> 1.3) - sass-rails (>= 4.0, < 6) - railties (5.0.1) - actionpack (= 5.0.1) - activesupport (= 5.0.1) + sassc-rails (>= 1.3, < 3) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -219,7 +231,7 @@ GEM ffi (>= 0.5.0) redcarpet (3.4.0) redis (3.3.3) - remotipart (1.3.1) + remotipart (1.4.4) request_store (1.3.2) responders (2.3.0) railties (>= 4.2.0, < 5.1) @@ -230,13 +242,25 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sass (3.4.23) - sass-rails (5.0.6) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt scrypt (3.0.7) ffi-compiler (>= 1.0, < 2.0) sexp_processor (4.8.0) @@ -256,17 +280,19 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) thor (0.19.4) - thread_safe (0.3.5) - tilt (2.0.6) - tzinfo (1.2.2) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (3.0.4) execjs (>= 0.3.0, < 3) @@ -277,7 +303,7 @@ GEM railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.4) whenever (0.9.7) chronic (>= 0.6.3) will_paginate (3.1.5) From 2e3a506afcc89100a96227d63edcf0443d87ac45 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 21:18:00 -0800 Subject: [PATCH 23/60] Updated aws gems --- Gemfile | 2 +- Gemfile.lock | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index f96830ff5..8bf1a49b8 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'rails', '~> 5.0.1' gem 'acts-as-taggable-on' gem 'authlogic' -gem 'aws-sdk' +gem 'aws-sdk-s3' gem 'coffee-rails', '~> 4.2' gem 'dynamic_form' gem 'exception_notification' diff --git a/Gemfile.lock b/Gemfile.lock index 07282f86b..82dc3190b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,14 +50,22 @@ GEM activesupport (>= 3.2, < 5.1) request_store (~> 1.0) scrypt (>= 1.2, < 4.0) - aws-sdk (2.7.9) - aws-sdk-resources (= 2.7.9) - aws-sdk-core (2.7.9) - aws-sigv4 (~> 1.0) + aws-eventstream (1.0.3) + aws-partitions (1.263.0) + aws-sdk-core (3.89.1) + aws-eventstream (~> 1.0, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-resources (2.7.9) - aws-sdk-core (= 2.7.9) - aws-sigv4 (1.0.0) + aws-sdk-kms (1.27.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.60.1) + aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) builder (3.2.4) byebug (9.0.6) chronic (0.10.2) @@ -114,7 +122,7 @@ GEM ruby_parser (~> 3.5) i18n (1.8.2) concurrent-ruby (~> 1.0) - jmespath (1.3.1) + jmespath (1.4.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -314,7 +322,7 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on authlogic - aws-sdk + aws-sdk-s3 byebug coffee-rails (~> 4.2) dotenv-rails From 3bfe5a638ac0743c24c1498910059e1340bb484e Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Tue, 14 Jan 2020 21:18:16 -0800 Subject: [PATCH 24/60] Include user in gallery sprites --- app/controllers/sprites_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/sprites_controller.rb b/app/controllers/sprites_controller.rb index c1635554f..9308dbd73 100644 --- a/app/controllers/sprites_controller.rb +++ b/app/controllers/sprites_controller.rb @@ -201,7 +201,7 @@ def collection .order(order) .where(["sprites.created_at > '%s'", recency]) .where.not(user_id: nil) - .includes(:taggings) + .includes(:taggings, :user) .search(params[:search]) .page(params[:page]) .per_page(per_page) From 15b13dc510efc1b9a89a35fcf730b6cb3495e430 Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Wed, 15 Jan 2020 07:55:23 -0800 Subject: [PATCH 25/60] Using s3 gem --- app/models/uploader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/uploader.rb b/app/models/uploader.rb index cc09d095e..d2d6c05b7 100644 --- a/app/models/uploader.rb +++ b/app/models/uploader.rb @@ -1,4 +1,4 @@ -require 'aws-sdk' +require "aws-sdk-s3" module Uploader def self.logger From bdace39df842bd9a3fef9a71f06a9dc6fc2cf211 Mon Sep 17 00:00:00 2001 From: Daniel X Moore Date: Sat, 12 Sep 2020 15:25:24 -0700 Subject: [PATCH 26/60] Update pixie.haml --- app/views/sprites/pixie.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/sprites/pixie.haml b/app/views/sprites/pixie.haml index c3d8267d4..b63ca4528 100644 --- a/app/views/sprites/pixie.haml +++ b/app/views/sprites/pixie.haml @@ -4,7 +4,7 @@ - width = @width || 64 - height = @height || 64 -%iframe#editor(src="https://danielx.net/pixel-editor/pixie3/" sandbox="allow-scripts allow-modals") +%iframe#editor(src="https://danielx.net/pixel-editor/pixie3/" sandbox="allow-scripts allow-modals allow-downloads") :sass html From 255db36b10a151f1df2da3bf6e108460a53ba967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 14:45:51 +0000 Subject: [PATCH 27/60] Bump sidekiq from 4.2.9 to 5.2.9 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 4.2.9 to 5.2.9. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v4.2.9...v5.2.9) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 82dc3190b..e077fb66b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,8 +77,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - connection_pool (2.2.1) + concurrent-ruby (1.1.9) + connection_pool (2.2.5) crass (1.0.5) debug_inspector (0.0.2) dotenv (2.2.0) @@ -155,7 +155,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -184,13 +186,13 @@ GEM i18n (>= 0.5.0) railties (>= 3.0.0) puma (3.12.2) - rack (2.1.1) + rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rack-test (0.6.3) rack (>= 1.0) @@ -238,7 +240,7 @@ GEM rb-inotify (0.9.8) ffi (>= 0.5.0) redcarpet (3.4.0) - redis (3.3.3) + redis (4.1.4) remotipart (1.4.4) request_store (1.3.2) responders (2.3.0) @@ -278,11 +280,11 @@ GEM shoulda-context (1.2.2) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.9) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.9) + connection_pool (~> 2.2, >= 2.2.2) + rack (~> 2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) + redis (>= 3.3.5, < 4.2) spring (2.0.1) activesupport (>= 4.2) spring-watcher-listen (2.0.1) From ba061626ebb15ca5b1b26ad841f23e0dd34284ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 21:59:06 +0000 Subject: [PATCH 28/60] Bump puma from 3.12.2 to 4.3.11 Bumps [puma](https://github.com/puma/puma) from 3.12.2 to 4.3.11. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.12.2...v4.3.11) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 8bf1a49b8..8be7986f6 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'paperclip' gem 'pg' gem 'pg_search' gem 'public_activity' -gem 'puma', '~> 3.0' +gem 'puma', '~> 4.3' gem 'rack-cors', :require => 'rack/cors' gem 'rails_admin' gem 'redcarpet' diff --git a/Gemfile.lock b/Gemfile.lock index 82dc3190b..99a72d5fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,7 +155,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -183,7 +185,8 @@ GEM activerecord (>= 3.0) i18n (>= 0.5.0) railties (>= 3.0.0) - puma (3.12.2) + puma (4.3.11) + nio4r (~> 2.0) rack (2.1.1) rack-cors (1.1.1) rack (>= 2.0.0) @@ -340,7 +343,7 @@ DEPENDENCIES pg pg_search public_activity - puma (~> 3.0) + puma (~> 4.3) rack-cors rails (~> 5.0.1) rails-controller-testing From 6f058cd1341b0d02367913ce3d62364e0d2fcced Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Fri, 25 Feb 2022 10:20:44 -0800 Subject: [PATCH 29/60] Updated ruby version and dev setup instructions --- .ruby-version | 2 +- README.md | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 197c4d5c2..3f5987a5c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.0 +2.4.9 diff --git a/README.md b/README.md index 89ef185d3..0b8751088 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,20 @@ Things you may want to cover: * Deployment instructions +## Setup + +```bash +sudo apt-get install -y imagemagick libmagickwand-dev postgresql libpq-dev +``` + +```bash +sudo service postgresql start +``` + +```bash +rake db:setup +``` + ## OSX Dev setup Install Homebrew if you don't already have it From bc2121c494c024e3e7c24f403f255af406601312 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 18:22:34 +0000 Subject: [PATCH 30/60] Bump sidekiq from 4.2.9 to 5.2.10 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 4.2.9 to 5.2.10. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v4.2.9...v5.2.10) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 99a72d5fe..b3331f105 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,8 +77,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) - connection_pool (2.2.1) + concurrent-ruby (1.1.9) + connection_pool (2.2.5) crass (1.0.5) debug_inspector (0.0.2) dotenv (2.2.0) @@ -187,13 +187,13 @@ GEM railties (>= 3.0.0) puma (4.3.11) nio4r (~> 2.0) - rack (2.1.1) + rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) rack-pjax (1.1.0) nokogiri (~> 1.5) rack (>= 1.1) - rack-protection (2.0.8.1) + rack-protection (2.2.0) rack rack-test (0.6.3) rack (>= 1.0) @@ -241,7 +241,7 @@ GEM rb-inotify (0.9.8) ffi (>= 0.5.0) redcarpet (3.4.0) - redis (3.3.3) + redis (4.5.1) remotipart (1.4.4) request_store (1.3.2) responders (2.3.0) @@ -281,11 +281,11 @@ GEM shoulda-context (1.2.2) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.9) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.10) + connection_pool (~> 2.2, >= 2.2.2) + rack (~> 2.0) rack-protection (>= 1.5.0) - redis (~> 3.2, >= 3.2.1) + redis (~> 4.5, < 4.6.0) spring (2.0.1) activesupport (>= 4.2) spring-watcher-listen (2.0.1) From f2b0d5e41babe6fc86d7e0d188a854e979eb0c5b Mon Sep 17 00:00:00 2001 From: "Daniel X. Moore" Date: Fri, 25 Feb 2022 10:57:50 -0800 Subject: [PATCH 31/60] bundle update --- Gemfile.lock | 33 ++++++++++++++------------------- README.md | 26 +++++++++++--------------- 2 files changed, 25 insertions(+), 34 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 89136b1e4..ed107b081 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.9) connection_pool (2.2.5) - crass (1.0.5) + crass (1.0.6) debug_inspector (0.0.2) dotenv (2.2.0) dotenv-rails (2.2.0) @@ -120,7 +120,7 @@ GEM haml (~> 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (1.8.2) + i18n (1.10.0) concurrent-ruby (~> 1.0) jmespath (1.4.0) jquery-rails (4.3.5) @@ -144,28 +144,28 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.4.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) memoist (0.15.0) metaclass (0.0.4) - method_source (0.9.2) + method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.0.2) + mini_mime (1.1.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.15.0) mocha (1.2.1) metaclass (~> 0.0.1) nested_form (0.3.2) - nio4r (2.5.2) - nokogiri (1.10.7) + nio4r (2.5.8) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -185,14 +185,9 @@ GEM activerecord (>= 3.0) i18n (>= 0.5.0) railties (>= 3.0.0) -<<<<<<< HEAD - puma (3.12.2) - rack (2.2.3) -======= puma (4.3.11) nio4r (~> 2.0) - rack (2.1.1) ->>>>>>> master + rack (2.2.3) rack-cors (1.1.1) rack (>= 2.0.0) rack-pjax (1.1.0) @@ -221,7 +216,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rails_admin (2.0.1) activemodel-serializers-xml (>= 1.0) @@ -241,7 +236,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (13.0.1) + rake (13.0.6) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) @@ -299,7 +294,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -308,7 +303,7 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.6) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (3.0.4) execjs (>= 0.3.0, < 3) @@ -319,7 +314,7 @@ GEM railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) whenever (0.9.7) chronic (>= 0.6.3) will_paginate (3.1.5) diff --git a/README.md b/README.md index 0b8751088..6be38a36f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Things you may want to cover: * Ruby version - * 2.4.0 + * 2.4.9 * System dependencies @@ -35,20 +35,6 @@ Things you may want to cover: * Deployment instructions -## Setup - -```bash -sudo apt-get install -y imagemagick libmagickwand-dev postgresql libpq-dev -``` - -```bash -sudo service postgresql start -``` - -```bash -rake db:setup -``` - ## OSX Dev setup Install Homebrew if you don't already have it @@ -68,6 +54,16 @@ If you're on OSX Sierra, you'll need to force an older version of ImageMagick Install all the project's dependencies with `bundle install` +## Ubuntu Setup + +```bash +sudo apt-get install -y imagemagick libmagickwand-dev postgresql libpq-dev +``` + +```bash +sudo service postgresql start +``` + ## First time configuration Create your development database From 4c6cb38bfdd13b3072d0da9eabd01ded31071f8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 18:59:37 +0000 Subject: [PATCH 32/60] Bump rails_admin from 2.0.1 to 2.0.2 Bumps [rails_admin](https://github.com/sferik/rails_admin) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/sferik/rails_admin/releases) - [Changelog](https://github.com/sferik/rails_admin/blob/master/CHANGELOG.md) - [Commits](https://github.com/sferik/rails_admin/compare/v2.0.1...v2.0.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed107b081..f4a757146 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - ffi (1.12.1) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -123,24 +123,24 @@ GEM i18n (1.10.0) concurrent-ruby (~> 1.0) jmespath (1.4.0) - jquery-rails (4.3.5) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - kaminari (1.1.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -218,7 +218,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails_admin (2.0.1) + rails_admin (2.0.2) activemodel-serializers-xml (>= 1.0) builder (~> 3.1) haml (>= 4.0, < 6) @@ -264,7 +264,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) From 5b922d1e96a51743f7b19e4285c610fbfa49b8b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 19:19:27 +0000 Subject: [PATCH 33/60] Bump redcarpet from 3.4.0 to 3.5.1 Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.4.0 to 3.5.1. - [Release notes](https://github.com/vmg/redcarpet/releases) - [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md) - [Commits](https://github.com/vmg/redcarpet/compare/v3.4.0...v3.5.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1746945b5..a1184e69e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,7 +240,7 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) - redcarpet (3.4.0) + redcarpet (3.5.1) redis (4.5.1) remotipart (1.4.4) request_store (1.3.2) From 502544746f9b73ae746757768dd142473967ec0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 19:22:46 +0000 Subject: [PATCH 34/60] Bump sanitize from 4.6.3 to 5.2.1 Bumps [sanitize](https://github.com/rgrove/sanitize) from 4.6.3 to 5.2.1. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v4.6.3...v5.2.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7abad253f..eaecaf642 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,7 +79,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.9) connection_pool (2.2.5) - crass (1.0.5) + crass (1.0.6) debug_inspector (0.0.2) dotenv (2.2.0) dotenv-rails (2.2.0) @@ -167,8 +167,8 @@ GEM nio4r (2.5.8) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (1.5.0) - nokogiri + nokogumbo (2.0.5) + nokogiri (~> 1.8, >= 1.8.4) paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -249,10 +249,10 @@ GEM rmagick (4.0.0) ruby_parser (3.8.4) sexp_processor (~> 4.1) - sanitize (4.6.3) + sanitize (5.2.1) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) From faa68e3cadebf6dc8900160e594e3cdd8099ffd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 19:03:54 -0700 Subject: [PATCH 35/60] Bump puma from 4.3.11 to 4.3.12 (#315) Bumps [puma](https://github.com/puma/puma) from 4.3.11 to 4.3.12. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.11...v4.3.12) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5d0442d56..26b7d6037 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,7 @@ GEM activerecord (>= 3.0) i18n (>= 0.5.0) railties (>= 3.0.0) - puma (4.3.11) + puma (4.3.12) nio4r (~> 2.0) rack (2.2.3) rack-cors (1.1.1) From f420da7779bbecc3f33ba189ae4ca69195979187 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 May 2022 22:28:30 -0700 Subject: [PATCH 36/60] Bump rack from 2.2.3 to 2.2.3.1 (#316) Bumps [rack](https://github.com/rack/rack) from 2.2.3 to 2.2.3.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.2.3...2.2.3.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 26b7d6037..95962fdea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM railties (>= 3.0.0) puma (4.3.12) nio4r (~> 2.0) - rack (2.2.3) + rack (2.2.3.1) rack-cors (1.1.1) rack (>= 2.0.0) rack-pjax (1.1.0) From fa47fd59ceb852be44463ce7861633115af553f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 10:03:20 -0700 Subject: [PATCH 37/60] Bump rails-html-sanitizer from 1.4.2 to 1.4.3 (#318) Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/rails/rails-html-sanitizer/releases) - [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: rails-html-sanitizer dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 95962fdea..97079ff3f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.14.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -216,7 +216,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails_admin (2.0.2) activemodel-serializers-xml (>= 1.0) From 57476b63d283162aff00aa120ad1a36f6f9d9ec7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:17:39 -0700 Subject: [PATCH 38/60] Bump tzinfo from 1.2.9 to 1.2.10 (#319) Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10. - [Release notes](https://github.com/tzinfo/tzinfo/releases) - [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md) - [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.9...v1.2.10) --- updated-dependencies: - dependency-name: tzinfo dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 97079ff3f..8e984c8d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) uglifier (3.0.4) execjs (>= 0.3.0, < 3) From c88520e823aefaaf52ad6ec5a7adb1a3483ef345 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 11 Dec 2022 20:50:04 -0800 Subject: [PATCH 39/60] Bump jmespath from 1.4.0 to 1.6.1 (#317) Bumps [jmespath](https://github.com/trevorrowe/jmespath.rb) from 1.4.0 to 1.6.1. - [Release notes](https://github.com/trevorrowe/jmespath.rb/releases) - [Changelog](https://github.com/jmespath/jmespath.rb/blob/main/CHANGELOG.md) - [Commits](https://github.com/trevorrowe/jmespath.rb/compare/v1.4.0...v1.6.1) --- updated-dependencies: - dependency-name: jmespath dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8e984c8d5..a8f3e632b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ GEM ruby_parser (~> 3.5) i18n (1.10.0) concurrent-ruby (~> 1.0) - jmespath (1.4.0) + jmespath (1.6.1) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) From d7a09b5f13139d90d0a26104f4d67681b397d25e Mon Sep 17 00:00:00 2001 From: Daniel X Moore Date: Sun, 11 Dec 2022 20:58:16 -0800 Subject: [PATCH 40/60] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8be7986f6..e85a50149 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '2.4.9' +ruby '2.7.7' source 'https://rubygems.org' git_source(:github) do |repo_name| From 17d5322eaa537dd4491ff65edb8c21c5ec40aeb8 Mon Sep 17 00:00:00 2001 From: Daniel X Moore Date: Sun, 11 Dec 2022 20:58:32 -0800 Subject: [PATCH 41/60] Update .ruby-version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 3f5987a5c..1f7da99d4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.9 +2.7.7 From 86453f13e6335fcb2e0207edadff36ca19f1156a Mon Sep 17 00:00:00 2001 From: Daniel X Moore Date: Sun, 11 Dec 2022 21:02:34 -0800 Subject: [PATCH 42/60] Update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a8f3e632b..58f9f4926 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -364,7 +364,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.4.9p362 + ruby 2.7.7 BUNDLED WITH 1.17.3 From 40a6dd14cad608545288343f1f510e940a31c8d4 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Tue, 13 Dec 2022 16:31:51 -0800 Subject: [PATCH 43/60] updating Ruby and gems --- .ruby-version | 2 +- Gemfile | 11 +- Gemfile.lock | 367 +++++++++--------- README.md | 2 +- config/initializers/new_framework_defaults.rb | 2 +- config/initializers/rails_admin.rb | 10 +- 6 files changed, 198 insertions(+), 196 deletions(-) diff --git a/.ruby-version b/.ruby-version index 1f7da99d4..ff365e06b 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 +3.1.3 diff --git a/Gemfile b/Gemfile index e85a50149..9c8054333 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '2.7.7' +ruby '3.1.3' source 'https://rubygems.org' git_source(:github) do |repo_name| @@ -6,12 +6,12 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -gem 'rails', '~> 5.0.1' +gem 'rails', '~> 6.1' gem 'acts-as-taggable-on' gem 'authlogic' gem 'aws-sdk-s3' -gem 'coffee-rails', '~> 4.2' +gem 'coffee-rails' gem 'dynamic_form' gem 'exception_notification' gem 'exception_notification-rake' @@ -23,16 +23,17 @@ gem 'paperclip' gem 'pg' gem 'pg_search' gem 'public_activity' -gem 'puma', '~> 4.3' +gem 'puma' gem 'rack-cors', :require => 'rack/cors' gem 'rails_admin' gem 'redcarpet' gem 'responders' gem 'rmagick' gem 'sanitize' -gem 'sass-rails', '~> 5.0' +gem 'sass-rails' gem 'sidekiq' gem 'uglifier', '>= 1.3.0' +gem "webrick", "~> 1.7" gem 'whenever' gem 'will_paginate' diff --git a/Gemfile.lock b/Gemfile.lock index 58f9f4926..8e7c2b902 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,55 +1,76 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.7.2) - actionpack (= 5.0.7.2) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) + actioncable (6.1.7) + actionpack (= 6.1.7) + activesupport (= 6.1.7) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.7) + actionpack (= 6.1.7) + activejob (= 6.1.7) + activerecord (= 6.1.7) + activestorage (= 6.1.7) + activesupport (= 6.1.7) + mail (>= 2.7.1) + actionmailer (6.1.7) + actionpack (= 6.1.7) + actionview (= 6.1.7) + activejob (= 6.1.7) + activesupport (= 6.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7.2) - actionview (= 5.0.7.2) - activesupport (= 5.0.7.2) - rack (~> 2.0) - rack-test (~> 0.6.3) + actionpack (6.1.7) + actionview (= 6.1.7) + activesupport (= 6.1.7) + rack (~> 2.0, >= 2.0.9) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.2) - activesupport (= 5.0.7.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.7) + actionpack (= 6.1.7) + activerecord (= 6.1.7) + activestorage (= 6.1.7) + activesupport (= 6.1.7) + nokogiri (>= 1.8.5) + actionview (6.1.7) + activesupport (= 6.1.7) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7.2) - activesupport (= 5.0.7.2) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.7) + activesupport (= 6.1.7) globalid (>= 0.3.6) - activemodel (5.0.7.2) - activesupport (= 5.0.7.2) + activemodel (6.1.7) + activesupport (= 6.1.7) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.0.7.2) - activemodel (= 5.0.7.2) - activesupport (= 5.0.7.2) - arel (~> 7.0) - activesupport (5.0.7.2) + activerecord (6.1.7) + activemodel (= 6.1.7) + activesupport (= 6.1.7) + activestorage (6.1.7) + actionpack (= 6.1.7) + activejob (= 6.1.7) + activerecord (= 6.1.7) + activesupport (= 6.1.7) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - acts-as-taggable-on (4.0.0) - activerecord (>= 4.0) - arel (7.1.4) - authlogic (3.5.0) - activerecord (>= 3.2, < 5.1) - activesupport (>= 3.2, < 5.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + acts-as-taggable-on (9.0.1) + activerecord (>= 6.0, < 7.1) + authlogic (6.4.2) + activemodel (>= 5.2, < 7.1) + activerecord (>= 5.2, < 7.1) + activesupport (>= 5.2, < 7.1) request_store (~> 1.0) - scrypt (>= 1.2, < 4.0) aws-eventstream (1.0.3) aws-partitions (1.263.0) aws-sdk-core (3.89.1) @@ -66,69 +87,56 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) + bindex (0.8.1) builder (3.2.4) byebug (9.0.6) chronic (0.10.2) climate_control (0.2.0) - coffee-rails (4.2.2) + coffee-rails (5.0.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0) + railties (>= 5.2.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) crass (1.0.6) - debug_inspector (0.0.2) - dotenv (2.2.0) - dotenv-rails (2.2.0) - dotenv (= 2.2.0) - railties (>= 3.2, < 5.1) + date (3.3.1) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) + railties (>= 3.2) dynamic_form (1.1.4) - erubis (2.7.0) - exception_notification (4.2.1) - actionmailer (>= 4.0, < 6) - activesupport (>= 4.0, < 6) - exception_notification-rake (0.3.0) - exception_notification (~> 4.2.0) + erubi (1.11.0) + exception_notification (4.5.0) + actionmailer (>= 5.2, < 8) + activesupport (>= 5.2, < 8) + exception_notification-rake (0.3.1) + exception_notification (~> 4.3) rake (>= 0.9.0) execjs (2.7.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) ffi (1.15.5) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake - foreman (0.83.0) - thor (~> 0.19.1) - globalid (0.4.2) - activesupport (>= 4.2.0) - haml (4.0.7) + foreman (0.87.2) + globalid (1.0.0) + activesupport (>= 5.0) + haml (6.1.1) + temple (>= 0.8.2) + thor tilt - haml-rails (0.9.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) - html2haml (>= 1.0.1) - railties (>= 4.0.1) - html2haml (2.1.0) - erubis (~> 2.7.0) - haml (~> 4.0) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) - i18n (1.10.0) + haml-rails (2.1.0) + actionpack (>= 5.1) + activesupport (>= 5.1) + haml (>= 4.0.6) + railties (>= 5.1) + i18n (1.12.0) concurrent-ruby (~> 1.0) jmespath (1.6.1) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -144,11 +152,15 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.18.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.0) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) memoist (0.15.0) metaclass (0.0.4) method_source (1.0.0) @@ -159,14 +171,24 @@ GEM nokogiri (~> 1) rake mini_mime (1.1.2) - mini_portile2 (2.4.0) - minitest (5.15.0) + mini_portile2 (2.8.0) + minitest (5.16.3) mocha (1.2.1) metaclass (~> 0.0.1) nested_form (0.3.2) + net-imap (0.3.2) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol nio4r (2.5.8) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) nokogumbo (2.0.5) nokogiri (~> 1.8, >= 1.8.4) paperclip (6.1.0) @@ -175,95 +197,78 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - pg (0.19.0) - pg_search (2.0.1) - activerecord (>= 4.2) - activesupport (>= 4.2) - arel (>= 6) - public_activity (1.5.0) - actionpack (>= 3.0.0) - activerecord (>= 3.0) + pg (1.4.5) + pg_search (2.3.6) + activerecord (>= 5.2) + activesupport (>= 5.2) + public_activity (2.0.2) + actionpack (>= 5.0.0) + activerecord (>= 5.0) i18n (>= 0.5.0) - railties (>= 3.0.0) + railties (>= 5.0.0) puma (4.3.12) nio4r (~> 2.0) - rack (2.2.3.1) + racc (1.6.1) + rack (2.2.4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-pjax (1.1.0) - nokogiri (~> 1.5) - rack (>= 1.1) rack-protection (2.2.0) rack - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.7.2) - actioncable (= 5.0.7.2) - actionmailer (= 5.0.7.2) - actionpack (= 5.0.7.2) - actionview (= 5.0.7.2) - activejob (= 5.0.7.2) - activemodel (= 5.0.7.2) - activerecord (= 5.0.7.2) - activesupport (= 5.0.7.2) - bundler (>= 1.3.0) - railties (= 5.0.7.2) + rack-test (2.0.2) + rack (>= 1.3) + rails (6.1.7) + actioncable (= 6.1.7) + actionmailbox (= 6.1.7) + actionmailer (= 6.1.7) + actionpack (= 6.1.7) + actiontext (= 6.1.7) + actionview (= 6.1.7) + activejob (= 6.1.7) + activemodel (= 6.1.7) + activerecord (= 6.1.7) + activestorage (= 6.1.7) + activesupport (= 6.1.7) + bundler (>= 1.15.0) + railties (= 6.1.7) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) - activesupport (~> 5.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - rails_admin (2.0.2) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) + rails_admin (3.1.0) activemodel-serializers-xml (>= 1.0) - builder (~> 3.1) - haml (>= 4.0, < 6) - jquery-rails (>= 3.0, < 5) - jquery-ui-rails (>= 5.0, < 7) kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) - rack-pjax (>= 0.7) - rails (>= 5.0, < 7) - remotipart (~> 1.3) - sassc-rails (>= 1.3, < 3) - railties (5.0.7.2) - actionpack (= 5.0.7.2) - activesupport (= 5.0.7.2) + rails (>= 6.0, < 8) + turbo-rails (~> 1.0) + railties (6.1.7) + actionpack (= 6.1.7) + activesupport (= 6.1.7) method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rake (13.0.6) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) redcarpet (3.5.1) redis (4.5.1) - remotipart (1.4.4) request_store (1.3.2) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) rmagick (4.0.0) - ruby_parser (3.8.4) - sexp_processor (~> 4.1) sanitize (5.2.1) crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -272,52 +277,55 @@ GEM sprockets (> 3.0) sprockets-rails tilt - scrypt (3.0.7) - ffi-compiler (>= 1.0, < 2.0) - sexp_processor (4.8.0) - shoulda (3.5.0) + shoulda (3.6.0) shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (>= 1.4.1, < 3.0) + shoulda-matchers (~> 3.0) shoulda-context (1.2.2) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) sidekiq (5.2.10) connection_pool (~> 2.2, >= 2.2.2) rack (~> 2.0) rack-protection (>= 1.5.0) redis (~> 4.5, < 4.6.0) - spring (2.0.1) - activesupport (>= 4.2) + spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) + temple (0.9.1) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) - thor (0.19.4) - thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.10) - thread_safe (~> 0.1) + thor (1.2.1) + tilt (2.0.11) + timeout (0.3.1) + turbo-rails (1.3.2) + actionpack (>= 6.0.0) + activejob (>= 6.0.0) + railties (>= 6.0.0) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) uglifier (3.0.4) execjs (>= 0.3.0, < 3) - web-console (3.4.0) - actionview (>= 5.0) - activemodel (>= 5.0) - debug_inspector - railties (>= 5.0) - websocket-driver (0.6.5) + web-console (4.2.0) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) + bindex (>= 0.4.0) + railties (>= 6.0.0) + webrick (1.7.0) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (0.9.7) chronic (>= 0.6.3) - will_paginate (3.1.5) + will_paginate (3.3.1) + zeitwerk (2.6.6) PLATFORMS ruby @@ -327,7 +335,7 @@ DEPENDENCIES authlogic aws-sdk-s3 byebug - coffee-rails (~> 4.2) + coffee-rails dotenv-rails dynamic_form exception_notification @@ -343,16 +351,16 @@ DEPENDENCIES pg pg_search public_activity - puma (~> 4.3) + puma rack-cors - rails (~> 5.0.1) + rails (~> 6.1) rails-controller-testing rails_admin redcarpet responders rmagick sanitize - sass-rails (~> 5.0) + sass-rails shoulda sidekiq spring @@ -360,11 +368,12 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + webrick (~> 1.7) whenever will_paginate RUBY VERSION - ruby 2.7.7 + ruby 3.1.3p185 BUNDLED WITH - 1.17.3 + 2.3.26 diff --git a/README.md b/README.md index 6be38a36f..681f89c6e 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Install all the project's dependencies with `bundle install` ## Ubuntu Setup ```bash -sudo apt-get install -y imagemagick libmagickwand-dev postgresql libpq-dev +sudo apt-get install -y build-essential patch ruby-dev zlib1g-dev liblzma-dev imagemagick libmagickwand-dev postgresql libpq-dev ``` ```bash diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb index 671abb69a..eed4ff36f 100644 --- a/config/initializers/new_framework_defaults.rb +++ b/config/initializers/new_framework_defaults.rb @@ -18,7 +18,7 @@ Rails.application.config.active_record.belongs_to_required_by_default = true # Do not halt callback chains when a callback returns false. Previous versions had true. -ActiveSupport.halt_callback_chains_on_return_false = false +# ActiveSupport.halt_callback_chains_on_return_false = false # Configure SSL options to enable HSTS with subdomains. Previous versions had false. Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index f6472b65d..4dc2ede61 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -2,15 +2,7 @@ require 'rails_admin/config/fields/base' module RailsAdmin - module Config - module Fields - module Types - class Citext < RailsAdmin::Config::Fields::Types::String - RailsAdmin::Config::Fields::Types::register(:citext, self) - end - end - end - end + # Allow for searching/filtering of `citext` fields. module Adapters From f727f1773ae7031a1d14cd75868179a44f7a56fe Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 08:49:18 -0700 Subject: [PATCH 44/60] postgres/authlogic update --- Gemfile | 1 + Gemfile.lock | 6 ++++++ README.md | 3 +++ app/models/user.rb | 8 ++++---- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 9c8054333..2465f65ab 100644 --- a/Gemfile +++ b/Gemfile @@ -31,6 +31,7 @@ gem 'responders' gem 'rmagick' gem 'sanitize' gem 'sass-rails' +gem 'scrypt' gem 'sidekiq' gem 'uglifier', '>= 1.3.0' gem "webrick", "~> 1.7" diff --git a/Gemfile.lock b/Gemfile.lock index 8e7c2b902..c8dc274b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,6 +122,9 @@ GEM factory_girl (~> 4.9.0) railties (>= 3.0.0) ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake foreman (0.87.2) globalid (1.0.0) activesupport (>= 5.0) @@ -277,6 +280,8 @@ GEM sprockets (> 3.0) sprockets-rails tilt + scrypt (3.0.7) + ffi-compiler (>= 1.0, < 2.0) shoulda (3.6.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (~> 3.0) @@ -361,6 +366,7 @@ DEPENDENCIES rmagick sanitize sass-rails + scrypt shoulda sidekiq spring diff --git a/README.md b/README.md index 681f89c6e..797cbc029 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,9 @@ sudo apt-get install -y build-essential patch ruby-dev zlib1g-dev liblzma-dev im ```bash sudo service postgresql start +sudo su - postgres +createuser --interactive --createdb $USER +exit ``` ## First time configuration diff --git a/app/models/user.rb b/app/models/user.rb index 7a3a51ff1..eb80cc3bf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -6,13 +6,13 @@ class User < ActiveRecord::Base length: { maximum: 45 } validates :email, - length: { maximum: 254 } + length: { maximum: 254 }, + format: { with: URI::MailTo::EMAIL_REGEXP } acts_as_authentic do |config| - config.validate_email_field :no_connected_sites? - config.validate_password_field :no_connected_sites? + # config.validate_password_field :no_connected_sites? config.require_password_confirmation = false - config.validates_length_of_password_field_options :minimum => 4, :if => :require_password? + # config.validates_length_of_password_field_options :minimum => 4, :if => :require_password? config.transition_from_crypto_providers = [Authlogic::CryptoProviders::Sha512] config.crypto_provider = Authlogic::CryptoProviders::SCrypt From 74aeddcc6bdc8074cec48fba24f2135592debc8a Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 08:49:46 -0700 Subject: [PATCH 45/60] sass imports --- app/assets/stylesheets/_card.sass | 2 ++ app/assets/stylesheets/_creator.sass | 2 ++ app/assets/stylesheets/animations.sass | 2 ++ app/assets/stylesheets/base.sass | 2 ++ app/assets/stylesheets/button.sass | 3 ++- app/assets/stylesheets/comments.sass | 2 ++ app/assets/stylesheets/errors.sass | 2 ++ app/assets/stylesheets/flash.sass | 2 ++ app/assets/stylesheets/form.sass | 2 ++ app/assets/stylesheets/header.sass | 2 ++ app/assets/stylesheets/invites.sass | 2 ++ app/assets/stylesheets/navigation.sass | 2 ++ app/assets/stylesheets/pagination.sass | 2 ++ app/assets/stylesheets/sprites.sass | 2 ++ app/assets/stylesheets/tags.sass | 2 ++ app/assets/stylesheets/tunes.sass | 2 ++ app/assets/stylesheets/user.sass | 2 ++ 17 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_card.sass b/app/assets/stylesheets/_card.sass index 7518e1034..f2495e000 100644 --- a/app/assets/stylesheets/_card.sass +++ b/app/assets/stylesheets/_card.sass @@ -1,3 +1,5 @@ +@import "variables" + card min-width: 256px display: inline-block diff --git a/app/assets/stylesheets/_creator.sass b/app/assets/stylesheets/_creator.sass index 0d623c210..625d5a71b 100644 --- a/app/assets/stylesheets/_creator.sass +++ b/app/assets/stylesheets/_creator.sass @@ -1,3 +1,5 @@ +@import "variables" + creator display: block diff --git a/app/assets/stylesheets/animations.sass b/app/assets/stylesheets/animations.sass index 6e3c89df5..a7c791af7 100644 --- a/app/assets/stylesheets/animations.sass +++ b/app/assets/stylesheets/animations.sass @@ -1,3 +1,5 @@ +@import "variables" + @keyframes slide-in-and-out-from-left 0% right: 110% diff --git a/app/assets/stylesheets/base.sass b/app/assets/stylesheets/base.sass index 490dafe0c..6eb4e6a3f 100644 --- a/app/assets/stylesheets/base.sass +++ b/app/assets/stylesheets/base.sass @@ -1,3 +1,5 @@ +@import "variables" + * box-sizing: border-box diff --git a/app/assets/stylesheets/button.sass b/app/assets/stylesheets/button.sass index fceb84cf4..24e827af5 100644 --- a/app/assets/stylesheets/button.sass +++ b/app/assets/stylesheets/button.sass @@ -1,3 +1,5 @@ +@import "variables" + button, .button background-color: white border-radius: 4px @@ -41,4 +43,3 @@ actions &:last-child margin-right: 0 - diff --git a/app/assets/stylesheets/comments.sass b/app/assets/stylesheets/comments.sass index c9c3ec8b9..8fa594dfe 100644 --- a/app/assets/stylesheets/comments.sass +++ b/app/assets/stylesheets/comments.sass @@ -1,3 +1,5 @@ +@import "variables" + comments display: block max-width: 400px diff --git a/app/assets/stylesheets/errors.sass b/app/assets/stylesheets/errors.sass index 1413f671c..a9448ebc3 100644 --- a/app/assets/stylesheets/errors.sass +++ b/app/assets/stylesheets/errors.sass @@ -1,3 +1,5 @@ +@import "variables" + #errorExplanation border-radius: 4px border: 2px solid red diff --git a/app/assets/stylesheets/flash.sass b/app/assets/stylesheets/flash.sass index 74461cbea..753de712c 100644 --- a/app/assets/stylesheets/flash.sass +++ b/app/assets/stylesheets/flash.sass @@ -1,3 +1,5 @@ +@import "variables" + #flash display: flex left: 0 diff --git a/app/assets/stylesheets/form.sass b/app/assets/stylesheets/form.sass index 79f33b1e2..daf08f975 100644 --- a/app/assets/stylesheets/form.sass +++ b/app/assets/stylesheets/form.sass @@ -1,3 +1,5 @@ +@import "variables" + input, textarea color: inherit padding: 3px 4px diff --git a/app/assets/stylesheets/header.sass b/app/assets/stylesheets/header.sass index 41450dbc0..0e9ac76c9 100644 --- a/app/assets/stylesheets/header.sass +++ b/app/assets/stylesheets/header.sass @@ -1,3 +1,5 @@ +@import "variables" + body > header background-color: $primary-color display: flex diff --git a/app/assets/stylesheets/invites.sass b/app/assets/stylesheets/invites.sass index 8e6bce9d2..2cc454a42 100644 --- a/app/assets/stylesheets/invites.sass +++ b/app/assets/stylesheets/invites.sass @@ -1,3 +1,5 @@ +@import "variables" + section.invite-sample margin-bottom: 2em margin-left: calc(58px - 0.5em) diff --git a/app/assets/stylesheets/navigation.sass b/app/assets/stylesheets/navigation.sass index 9cb58fe7b..1c97b6901 100644 --- a/app/assets/stylesheets/navigation.sass +++ b/app/assets/stylesheets/navigation.sass @@ -1,3 +1,5 @@ +@import "variables" + content > nav display: flex diff --git a/app/assets/stylesheets/pagination.sass b/app/assets/stylesheets/pagination.sass index ccc65d802..8ae91a172 100644 --- a/app/assets/stylesheets/pagination.sass +++ b/app/assets/stylesheets/pagination.sass @@ -1,3 +1,5 @@ +@import "variables" + .pagination display: flex margin: 1em 1em 1em 0 diff --git a/app/assets/stylesheets/sprites.sass b/app/assets/stylesheets/sprites.sass index c89f900dd..9cc328822 100644 --- a/app/assets/stylesheets/sprites.sass +++ b/app/assets/stylesheets/sprites.sass @@ -1,3 +1,5 @@ +@import "variables" + sprites display: block min-height: 100px diff --git a/app/assets/stylesheets/tags.sass b/app/assets/stylesheets/tags.sass index 4a5396d0c..a401e2a9e 100644 --- a/app/assets/stylesheets/tags.sass +++ b/app/assets/stylesheets/tags.sass @@ -1,3 +1,5 @@ +@import "variables" + tags align-items: center display: flex diff --git a/app/assets/stylesheets/tunes.sass b/app/assets/stylesheets/tunes.sass index d30a8505d..063fe4d30 100644 --- a/app/assets/stylesheets/tunes.sass +++ b/app/assets/stylesheets/tunes.sass @@ -1,3 +1,5 @@ +@import "variables" + tunes display: block min-height: 100px diff --git a/app/assets/stylesheets/user.sass b/app/assets/stylesheets/user.sass index 83743bce2..52ac6f578 100644 --- a/app/assets/stylesheets/user.sass +++ b/app/assets/stylesheets/user.sass @@ -1,3 +1,5 @@ +@import "variables" + section.profile overflow: hidden From 2be235ff4c9eace51d14b418ea2d2356b652ff17 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 10:40:07 -0700 Subject: [PATCH 46/60] rails admin --- Gemfile | 1 + Gemfile.lock | 1 + config/initializers/rails_admin.rb | 1 + 3 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 2465f65ab..310bd7432 100644 --- a/Gemfile +++ b/Gemfile @@ -62,3 +62,4 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'sassc-rails' diff --git a/Gemfile.lock b/Gemfile.lock index c8dc274b5..75832dd7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,6 +366,7 @@ DEPENDENCIES rmagick sanitize sass-rails + sassc-rails scrypt shoulda sidekiq diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index 4dc2ede61..416a932d7 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -28,6 +28,7 @@ class StatementBuilder < RailsAdmin::AbstractModel::StatementBuilder RailsAdmin.config do |config| + config.asset_source = :sprockets config.parent_controller = "::ApplicationController" From 4d360579395b6f79f70c6411cc9e615749f1616e Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 15:17:58 -0700 Subject: [PATCH 47/60] -uglifier --- Gemfile | 1 - Gemfile.lock | 3 --- config/environments/production.rb | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 310bd7432..448b00465 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,6 @@ gem 'sanitize' gem 'sass-rails' gem 'scrypt' gem 'sidekiq' -gem 'uglifier', '>= 1.3.0' gem "webrick", "~> 1.7" gem 'whenever' gem 'will_paginate' diff --git a/Gemfile.lock b/Gemfile.lock index 75832dd7e..c5326afa7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -316,8 +316,6 @@ GEM railties (>= 6.0.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - uglifier (3.0.4) - execjs (>= 0.3.0, < 3) web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -373,7 +371,6 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data - uglifier (>= 1.3.0) web-console (>= 3.3.0) webrick (~> 1.7) whenever diff --git a/config/environments/production.rb b/config/environments/production.rb index 30a364bac..a5868ba15 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -19,7 +19,7 @@ config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier + config.assets.js_compressor = nil # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. From b48a53fce1715255efff905093d23b9ee9d41274 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 15:19:32 -0700 Subject: [PATCH 48/60] ignore assets dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dad5cea5e..0f868376b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /db/*.sqlite3-journal /log/* /tmp/* +/public/assets/ From a4510c770fbb10d14bcb77e523352dc1a00bb31a Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 15:37:02 -0700 Subject: [PATCH 49/60] rails 6 storage --- config/storage.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 config/storage.yml diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..695f17bd3 --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,7 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> From 48503c4ff222b498a3bfa46258ebd1ab3527ec38 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 16:16:11 -0700 Subject: [PATCH 50/60] mailer helper; URI.escape monkey patch --- Gemfile.lock | 18 +++++++++--------- app/mailers/application_mailer.rb | 4 +++- app/models/invite.rb | 2 +- config/initializers/uri_escape.rb | 22 ++++++++++++++++++++++ 4 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 config/initializers/uri_escape.rb diff --git a/Gemfile.lock b/Gemfile.lock index c5326afa7..de2e1e707 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) connection_pool (2.2.5) crass (1.0.6) date (3.3.1) @@ -167,15 +167,15 @@ GEM memoist (0.15.0) metaclass (0.0.4) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) + mime-types-data (3.2023.0218.1) mimemagic (0.3.10) nokogiri (~> 1) rake mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) + mini_portile2 (2.8.1) + minitest (5.18.0) mocha (1.2.1) metaclass (~> 0.0.1) nested_form (0.3.2) @@ -189,7 +189,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.10) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) nokogumbo (2.0.5) @@ -211,7 +211,7 @@ GEM railties (>= 5.0.0) puma (4.3.12) nio4r (~> 2.0) - racc (1.6.1) + racc (1.6.2) rack (2.2.4) rack-cors (1.1.1) rack (>= 2.0.0) @@ -314,7 +314,7 @@ GEM actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) web-console (4.2.0) actionview (>= 6.0.0) @@ -328,7 +328,7 @@ GEM whenever (0.9.7) chronic (>= 0.6.3) will_paginate (3.3.1) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 1fcba2344..dae5960ca 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,5 +1,7 @@ class ApplicationMailer < ActionMailer::Base - add_template_helper(ApplicationHelper) + helper ApplicationHelper + + default_url_options[:host] = ENV["HTTP_HOST"] default from: 'Pixie ' layout 'mailer' diff --git a/app/models/invite.rb b/app/models/invite.rb index 2500c03cd..c8b184e9d 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -3,7 +3,7 @@ class Invite < ActiveRecord::Base validates_presence_of :user, :token, :email, :to - validates_format_of :email, :with => Authlogic::Regex.email + validates_format_of :email, :with => URI::MailTo::EMAIL_REGEXP validates_format_of :to, :with => /\A[A-Za-z0-9 ]*\Z/, :message => "should have a more personalized name" after_commit on: :create do diff --git a/config/initializers/uri_escape.rb b/config/initializers/uri_escape.rb new file mode 100644 index 000000000..b55f8f8d9 --- /dev/null +++ b/config/initializers/uri_escape.rb @@ -0,0 +1,22 @@ +require 'uri' + +# Hack since Paperclip uses URI.escape but it was removed in Ruby 3.0 +module URI + class << self + def escape(str) + alpha = "a-zA-Z" + alnum = "#{alpha}\\d" + unreserved = "\\-_.!~*'()#{alnum}" + reserved = ";/?:@&=+$,\\[\\]" + unsafe = Regexp.new("[^#{unreserved}#{reserved}]") + str.gsub(unsafe) do + us = $& + tmp = '' + us.each_byte do |uc| + tmp << sprintf('%%%02X', uc) + end + tmp + end.force_encoding(Encoding::US_ASCII) + end + end +end From 3d21264ca02c5fb735ffd15d8d02aae5466465b2 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 16:22:11 -0700 Subject: [PATCH 51/60] remove excanvas ie9 support --- app/views/shared/_javascripts.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/shared/_javascripts.haml b/app/views/shared/_javascripts.haml index eef179dd1..5fa70ea47 100644 --- a/app/views/shared/_javascripts.haml +++ b/app/views/shared/_javascripts.haml @@ -11,9 +11,6 @@ document.write(unescape('%3Cscript src="/assets/jquery/jquery-ui.min.js"%3E%3C/script%3E')); } -/[if lt IE 9] - = javascript_include_tag "excanvas.compiled" - :coffeescript window.railsEnv = #{Rails.env.to_json} From 330c1ed2a76fb6af7826f090292da3ec9aad45ab Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 22 Apr 2023 16:28:47 -0700 Subject: [PATCH 52/60] redis url? --- config/cable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cable.yml b/config/cable.yml index 0bbde6f74..22dcab221 100644 --- a/config/cable.yml +++ b/config/cable.yml @@ -6,4 +6,4 @@ test: production: adapter: redis - url: redis://localhost:6379/1 + url: <%= ENV["REDIS_URL"] %> From 4cbdd672c7092c11b1d560db9966ad73c0f1b8b4 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sun, 23 Apr 2023 10:25:19 -0700 Subject: [PATCH 53/60] update_attributes -> update --- app/controllers/sprites_controller.rb | 4 ++-- app/controllers/tunes_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/models/concerns/oauthable.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/sprites_controller.rb b/app/controllers/sprites_controller.rb index 9308dbd73..ca78d8cec 100644 --- a/app/controllers/sprites_controller.rb +++ b/app/controllers/sprites_controller.rb @@ -107,7 +107,7 @@ def destroy def update @sprite = Sprite.find(params[:id]) - @sprite.update_attributes(sprite_params) + @sprite.update(sprite_params) respond_with(@sprite) end @@ -128,7 +128,7 @@ def import @sprite = Sprite.new @sprite.user = current_user - if @sprite.update_attributes(params[:sprite]) + if @sprite.update(params[:sprite]) redirect_to @sprite else # Errors diff --git a/app/controllers/tunes_controller.rb b/app/controllers/tunes_controller.rb index 3d52ad3d4..1e2a79fd2 100644 --- a/app/controllers/tunes_controller.rb +++ b/app/controllers/tunes_controller.rb @@ -84,7 +84,7 @@ def destroy def update @tune = Tune.find(params[:id]) - @tune.update_attributes(tune_params) + @tune.update(tune_params) respond_with(@tune) end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b9ee848f8..4978158be 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -135,7 +135,7 @@ def edit end def update - user.update_attributes(user_params) + user.update(user_params) respond_with user end diff --git a/app/models/concerns/oauthable.rb b/app/models/concerns/oauthable.rb index 7b9fbb731..f20d88176 100644 --- a/app/models/concerns/oauthable.rb +++ b/app/models/concerns/oauthable.rb @@ -14,6 +14,6 @@ def token_for(provider) def update_oauth(provider, token) oauth_tokens .find_or_initialize_by_provider(provider) - .update_attributes(token: token) + .update(token: token) end end From 2ffd0749008db33330dcda5529bfecceeb8e0579 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Apr 2023 10:28:25 -0700 Subject: [PATCH 54/60] Bump rack from 2.2.4 to 2.2.6.4 (#327) Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.4. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.4) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index de2e1e707..0cdd84d41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM puma (4.3.12) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.4) + rack (2.2.6.4) rack-cors (1.1.1) rack (>= 2.0.0) rack-protection (2.2.0) From 41b9054953a70f3ce30998d02065f9be6ffd8497 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Apr 2023 10:28:50 -0700 Subject: [PATCH 55/60] Bump globalid from 1.0.0 to 1.1.0 (#328) Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0cdd84d41..93670b4dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,7 @@ GEM ffi (>= 1.0.0) rake foreman (0.87.2) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) haml (6.1.1) temple (>= 0.8.2) From c7c7a57adc973112d83db4ea43cf09d4598c5039 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Apr 2023 10:29:51 -0700 Subject: [PATCH 56/60] Bump sanitize from 5.2.1 to 6.0.1 (#325) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.1 to 6.0.1. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.1...v6.0.1) --- updated-dependencies: - dependency-name: sanitize dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 93670b4dd..dbeb0a233 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,8 +192,6 @@ GEM nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogumbo (2.0.5) - nokogiri (~> 1.8, >= 1.8.4) paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -266,10 +264,9 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rmagick (4.0.0) - sanitize (5.2.1) + sanitize (6.0.1) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) From 6a8c5eec5593c3384f134f0f4606b1a1724e6724 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sun, 23 Apr 2023 10:32:32 -0700 Subject: [PATCH 57/60] 6.1.7.1 --- Gemfile | 2 +- Gemfile.lock | 112 +++++++++++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index 448b00465..c0ec000d0 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -gem 'rails', '~> 6.1' +gem 'rails', '6.1.7.1' gem 'acts-as-taggable-on' gem 'authlogic' diff --git a/Gemfile.lock b/Gemfile.lock index dbeb0a233..cc12e2c58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,64 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + actioncable (6.1.7.1) + actionpack (= 6.1.7.1) + activesupport (= 6.1.7.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actionmailbox (6.1.7.1) + actionpack (= 6.1.7.1) + activejob (= 6.1.7.1) + activerecord (= 6.1.7.1) + activestorage (= 6.1.7.1) + activesupport (= 6.1.7.1) mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) + actionmailer (6.1.7.1) + actionpack (= 6.1.7.1) + actionview (= 6.1.7.1) + activejob (= 6.1.7.1) + activesupport (= 6.1.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) + actionpack (6.1.7.1) + actionview (= 6.1.7.1) + activesupport (= 6.1.7.1) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actiontext (6.1.7.1) + actionpack (= 6.1.7.1) + activerecord (= 6.1.7.1) + activestorage (= 6.1.7.1) + activesupport (= 6.1.7.1) nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (6.1.7.1) + activesupport (= 6.1.7.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) + activejob (6.1.7.1) + activesupport (= 6.1.7.1) globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) + activemodel (6.1.7.1) + activesupport (= 6.1.7.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) + activerecord (6.1.7.1) + activemodel (= 6.1.7.1) + activesupport (= 6.1.7.1) + activestorage (6.1.7.1) + actionpack (= 6.1.7.1) + activejob (= 6.1.7.1) + activerecord (= 6.1.7.1) + activesupport (= 6.1.7.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7) + activesupport (6.1.7.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -217,20 +217,20 @@ GEM rack rack-test (2.0.2) rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + rails (6.1.7.1) + actioncable (= 6.1.7.1) + actionmailbox (= 6.1.7.1) + actionmailer (= 6.1.7.1) + actionpack (= 6.1.7.1) + actiontext (= 6.1.7.1) + actionview (= 6.1.7.1) + activejob (= 6.1.7.1) + activemodel (= 6.1.7.1) + activerecord (= 6.1.7.1) + activestorage (= 6.1.7.1) + activesupport (= 6.1.7.1) bundler (>= 1.15.0) - railties (= 6.1.7) + railties (= 6.1.7.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -241,15 +241,15 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) - rails_admin (3.1.0) + rails_admin (3.1.2) activemodel-serializers-xml (>= 1.0) kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (~> 1.0) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + railties (6.1.7.1) + actionpack (= 6.1.7.1) + activesupport (= 6.1.7.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -307,7 +307,7 @@ GEM thor (1.2.1) tilt (2.0.11) timeout (0.3.1) - turbo-rails (1.3.2) + turbo-rails (1.4.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -353,7 +353,7 @@ DEPENDENCIES public_activity puma rack-cors - rails (~> 6.1) + rails (= 6.1.7.1) rails-controller-testing rails_admin redcarpet From 0e6dd5b8f6779983c6ed43826169312a2a2641ca Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sun, 23 Apr 2023 10:33:47 -0700 Subject: [PATCH 58/60] 6.1.7.3 --- Gemfile | 2 +- Gemfile.lock | 108 +++++++++++++++++++++++++-------------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Gemfile b/Gemfile index c0ec000d0..9c679b73e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end -gem 'rails', '6.1.7.1' +gem 'rails', '6.1.7.3' gem 'acts-as-taggable-on' gem 'authlogic' diff --git a/Gemfile.lock b/Gemfile.lock index cc12e2c58..5dd9ce521 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,64 +1,64 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.1) - actionpack (= 6.1.7.1) - activesupport (= 6.1.7.1) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.1) - actionpack (= 6.1.7.1) - activejob (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.1.7.1) - actionpack (= 6.1.7.1) - actionview (= 6.1.7.1) - activejob (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.1) - actionview (= 6.1.7.1) - activesupport (= 6.1.7.1) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.1) - actionpack (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.1.7.1) - activesupport (= 6.1.7.1) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.1) - activesupport (= 6.1.7.1) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.1.7.1) - activesupport (= 6.1.7.1) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.7.1) - activemodel (= 6.1.7.1) - activesupport (= 6.1.7.1) - activestorage (6.1.7.1) - actionpack (= 6.1.7.1) - activejob (= 6.1.7.1) - activerecord (= 6.1.7.1) - activesupport (= 6.1.7.1) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.1) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -217,20 +217,20 @@ GEM rack rack-test (2.0.2) rack (>= 1.3) - rails (6.1.7.1) - actioncable (= 6.1.7.1) - actionmailbox (= 6.1.7.1) - actionmailer (= 6.1.7.1) - actionpack (= 6.1.7.1) - actiontext (= 6.1.7.1) - actionview (= 6.1.7.1) - activejob (= 6.1.7.1) - activemodel (= 6.1.7.1) - activerecord (= 6.1.7.1) - activestorage (= 6.1.7.1) - activesupport (= 6.1.7.1) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) bundler (>= 1.15.0) - railties (= 6.1.7.1) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -247,9 +247,9 @@ GEM nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (~> 1.0) - railties (6.1.7.1) - actionpack (= 6.1.7.1) - activesupport (= 6.1.7.1) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -353,7 +353,7 @@ DEPENDENCIES public_activity puma rack-cors - rails (= 6.1.7.1) + rails (= 6.1.7.3) rails-controller-testing rails_admin redcarpet From de797f5a9bad14670b2965a3548ee2fd14755313 Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Fri, 5 May 2023 21:27:32 -0700 Subject: [PATCH 59/60] fix login --- Gemfile | 2 +- Gemfile.lock | 12 +++++++++--- app/controllers/user_sessions_controller.rb | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9c679b73e..10bad0ebf 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'acts-as-taggable-on' gem 'authlogic' gem 'aws-sdk-s3' gem 'coffee-rails' -gem 'dynamic_form' +gem 'dynamic_form', git: 'git@github.com:payrollhero/dynamic_form.git', ref: '7f90400' gem 'exception_notification' gem 'exception_notification-rake' gem 'foreman' diff --git a/Gemfile.lock b/Gemfile.lock index 5dd9ce521..ed9e2b75b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: git@github.com:payrollhero/dynamic_form.git + revision: 7f904005f6001a0b908dd879c34547b0e87a34e7 + ref: 7f90400 + specs: + dynamic_form (1.1.4) + GEM remote: https://rubygems.org/ specs: @@ -107,7 +114,6 @@ GEM dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) - dynamic_form (1.1.4) erubi (1.11.0) exception_notification (4.5.0) actionmailer (>= 5.2, < 8) @@ -137,7 +143,7 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) jmespath (1.6.1) kaminari (1.2.2) @@ -337,7 +343,7 @@ DEPENDENCIES byebug coffee-rails dotenv-rails - dynamic_form + dynamic_form! exception_notification exception_notification-rake factory_girl_rails diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index dd9875448..d047f079d 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -5,7 +5,7 @@ def new def create if params[:user_session][:login] == "yes" # Default to remember me - @user_session = UserSession.new(user_session_params.merge(:remember_me => true)) + @user_session = UserSession.new(user_session_params.to_h.merge(:remember_me => true)) @user_session.save do |result| if result new_user = @user_session.user.login_count == 1 From 54b07bc06c5dfa060dc9984aa938673ca252508a Mon Sep 17 00:00:00 2001 From: Daniel Moore Date: Sat, 6 May 2023 07:50:25 -0700 Subject: [PATCH 60/60] Using https for dynamic form gem --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 10bad0ebf..da0f0b5c0 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'acts-as-taggable-on' gem 'authlogic' gem 'aws-sdk-s3' gem 'coffee-rails' -gem 'dynamic_form', git: 'git@github.com:payrollhero/dynamic_form.git', ref: '7f90400' +gem 'dynamic_form', git: 'https://github.com/payrollhero/dynamic_form.git', ref: '7f90400' gem 'exception_notification' gem 'exception_notification-rake' gem 'foreman' diff --git a/Gemfile.lock b/Gemfile.lock index ed9e2b75b..2a357849b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git@github.com:payrollhero/dynamic_form.git + remote: https://github.com/payrollhero/dynamic_form.git revision: 7f904005f6001a0b908dd879c34547b0e87a34e7 ref: 7f90400 specs: