Merge branch 'develop' into deploy

OneBusAway · Oct 19, 2024 · 0a1347c · 0a1347c
2 parents af8c1bd + 041e6d2
commit 0a1347c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/app/models/admin.rb b/app/models/admin.rb
@@ -11,7 +11,7 @@ class Admin < ApplicationRecord
   # Creation
   ######
 
-  # after_create :send_password_reset
+  after_create :send_password_reset
 
   def self.create_admin!(name, email, region_id)
     region = Region.find(region_id)
@@ -24,25 +24,21 @@ def self.create_admin!(name, email, region_id)
     admin
   end
 
-  # def send_password_reset
-  #   self.reset_sent_at = DateTime.now
-  #   self.reset_digest = SecureRandom.urlsafe_base64
-  #   self.save!
+  def send_password_reset
+    self.reset_sent_at = DateTime.now
+    self.reset_digest = SecureRandom.urlsafe_base64
+    self.save!
 
-  #   mailer = UserMailer.password_reset(self)
-  #   mailer.deliver_now
-  # end
+    mailer = UserMailer.password_reset(self)
+    mailer.deliver_now
+  end
 
   ######
   # Regions
   ######
 
   belongs_to :region
 
-  ######
-  # Password Resets
-  ######
-
   ######
   # Sessions
   ######

diff --git a/app/models/alert_feed_item.rb b/app/models/alert_feed_item.rb
@@ -39,7 +39,7 @@ def gtfs_cause
     TransitRealtime::Alert::Cause::UNKNOWN_CAUSE
   end
 
-  enum cause: CAUSES.collect(&:first)
+  enum :cause, CAUSES.collect(&:first)
 
   ###########
   # Effect
@@ -57,7 +57,7 @@ def gtfs_cause
     [:stop_moved, TransitRealtime::Alert::Effect::STOP_MOVED]
   ].freeze
 
-  enum effect: EFFECTS.collect(&:first)
+  enum :effect, EFFECTS.collect(&:first)
 
   def gtfs_effect
     EFFECTS.each do |sym, gtfs_val|

diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
@@ -1 +1 @@
-ZfCTvuvzm6l1KcOFTlK/y42AKIcBEfAcvhkHbsKF6pdroYs/sXmgtqQk0y26KeuIvhsApkbdlugx0exDhdJCwFZIGoCo5Wi4pi9jHm8zYhpju/4P+xX00vFBW/9qjd0PccycCQlycW8iMaoJ6E2LrpqNXtnrzYAj4vuRLbNWm98yaiJ/Wbj6KJSiaTXyNgYIPTZz78aL++ObBDXvcNXEWer+bIAUV+8yzpMROSoyzGUKjeWORzItIOGpIF0nA5sDNe/t03MUEyc+Uy1xBBTjYZ4WOH2NfMSMQSkhd8yiYMEn8Ukn5WopWAP1hXtNZ8+uFwqd5hGnyTBCGftXaPqndkXLp1zqngR8XZwtGq9I/rDu6r6Ugw3u+tiVuNZe9itcJJvelq+liFCJtx/cPMwZKOjDD1BxUHqqSD5cGQ31IPgKL3QWrQ+20ThkDle5sYG1NwnmNtj6idcKS3UVmvoNZYUb0To7Bh1tPMOm84luLId+4FEtBBxp/vvUuZf0Bq1FhECT5h1uOOkbbUud602tfOtv2+gzC9sIbrmwSLL27fJCBDhf2D7vdafb77QWhIvkVOF/bGiJxAWXJ8Wm84ey4lFGLypSkzg5yS6CAIsUllZgOXDPHjVCyf0CaflfYDZrhV3OTW8mwd0lvkfIwG/ypPvjOmT7ThM+csFrb8fYJsUMnOh5GLQa9iEjRZLldMVkQjGe4GfkY0SllEezKvAWYfr3jbt+IIvBS5huUtl8ZzcNrLnmELGrQ+E313MVftyq5RnOCXp5sVdgllsJaQP7W+E2QnHAhfYjywb9r4X2aVzZFQLcwNxZlLRWCir8ii/Nk7NKndfnYbtW8cmDnIwxojkrdKXwNArpSlA/SzESvoxguLjr26hLnZPKoypyMSjQ3NabtvltKK9GFlhb5gWo0+2QcCL79mxsviqm4TRSJS/nQfignzLzzUvy2G7iRMT3is98KHSXfat+hh0Gd0DJKFMNqLFy/waCTOovHsKDWGt442jCtzQ+zUX2Gg==--6PGBhHFwxQkesd9u--wO7smlnNCrfZd0Ee7Sdydw==
+mReeWJMgotk6skEexquR5I+S/eRAULH1e1i409xaW1Qa33j580edxyFlBjYIFd+nmO2p7VWr3isGu8kiugTS81sWtuQxakR6tcJypKlR2wzOHoxrru9FLBLWjVfRl/5DfHJ6UHYChw8f70mP2wl9H91j5+0W1y914kopQ5d1mfA76mM7QA9g2UdJUHzv7IDUdgClMFucbnSiYLA/Dux1gDIGKc055G+wkM6q9pl5fvghJh2Om2Tv/nZEB/WRl97kN2SuQMeJeQWDegdtWp0Jree01rrBsNeGuTzgCY0JofkmvjBKwiyza2bGl5PlgjCb+DznNO4gM7V3lyZwoiPyX1SER5ks8hqrCWHI2pcX7/+5SLAOYW0antLdAJQg/048YxPLYJnjZQnmOPxmQdyOWUQuz16nI3YTuDJ9RKPW3QUbpzchJUg7KLHOpGG59ltgOHnast4UuSMppKrf133satp742j0KPifeP6o+QmKK1BLgeq40lnWvOWflll+9ZcDuu3ImBZPQFk87o+2Fnk8be4+I8QOxyVWBL+8TUd6hPynsK0yjRcIYcd5OB7LdgPO4eOvs0nAdC077Z1YuZ/BsfIw6W6rd71IOZyRjhHqHJEMlBjUWFFhYXO+P4rPYj4GGwSE/sA37Y9ipxXHYyi+7cnUJnXOrGOuI/mmysb8heZuKveJ3KqJhnVjR+A3rKiwF13MQLGtiPQJAHCyAXG61w3h7dBJpkCZrhu1WjYuTOBSPZ1AJtRLIQM4wKrDpkzLoXJ9DJMmpa7FCD7usCnPzsL8Tv+7WihWWxs4Oa6mZSLK/ubt/Tu2hLR2xuARGMmBxvmFRElH4vrGYwRUbNr10MeRYAUTzsBfinTZWdSQe5bJvyL+oyesWbMWqCbOdjUkkHWGwp5xHg1klahPxoVT5ou37v6jeaIJwgAS1Wcy1JTeiWwgmg/918BCkZ+ZxfyqL5k9KKKkI7ZN1jN6hFt5X+EIzz3qs1xhldqH21PM59M0U7UqAMoBuM6euw==--E9LI/t7jna5rKa95--4MK/MVBXsINLUbAgV9fNJg==
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ZfCTvuvzm6l1KcOFTlK/y42AKIcBEfAcvhkHbsKF6pdroYs/sXmgtqQk0y26KeuIvhsApkbdlugx0exDhdJCwFZIGoCo5Wi4pi9jHm8zYhpju/4P+xX00vFBW/9qjd0PccycCQlycW8iMaoJ6E2LrpqNXtnrzYAj4vuRLbNWm98yaiJ/Wbj6KJSiaTXyNgYIPTZz78aL++ObBDXvcNXEWer+bIAUV+8yzpMROSoyzGUKjeWORzItIOGpIF0nA5sDNe/t03MUEyc+Uy1xBBTjYZ4WOH2NfMSMQSkhd8yiYMEn8Ukn5WopWAP1hXtNZ8+uFwqd5hGnyTBCGftXaPqndkXLp1zqngR8XZwtGq9I/rDu6r6Ugw3u+tiVuNZe9itcJJvelq+liFCJtx/cPMwZKOjDD1BxUHqqSD5cGQ31IPgKL3QWrQ+20ThkDle5sYG1NwnmNtj6idcKS3UVmvoNZYUb0To7Bh1tPMOm84luLId+4FEtBBxp/vvUuZf0Bq1FhECT5h1uOOkbbUud602tfOtv2+gzC9sIbrmwSLL27fJCBDhf2D7vdafb77QWhIvkVOF/bGiJxAWXJ8Wm84ey4lFGLypSkzg5yS6CAIsUllZgOXDPHjVCyf0CaflfYDZrhV3OTW8mwd0lvkfIwG/ypPvjOmT7ThM+csFrb8fYJsUMnOh5GLQa9iEjRZLldMVkQjGe4GfkY0SllEezKvAWYfr3jbt+IIvBS5huUtl8ZzcNrLnmELGrQ+E313MVftyq5RnOCXp5sVdgllsJaQP7W+E2QnHAhfYjywb9r4X2aVzZFQLcwNxZlLRWCir8ii/Nk7NKndfnYbtW8cmDnIwxojkrdKXwNArpSlA/SzESvoxguLjr26hLnZPKoypyMSjQ3NabtvltKK9GFlhb5gWo0+2QcCL79mxsviqm4TRSJS/nQfignzLzzUvy2G7iRMT3is98KHSXfat+hh0Gd0DJKFMNqLFy/waCTOovHsKDWGt442jCtzQ+zUX2Gg==--6PGBhHFwxQkesd9u--wO7smlnNCrfZd0Ee7Sdydw==
		mReeWJMgotk6skEexquR5I+S/eRAULH1e1i409xaW1Qa33j580edxyFlBjYIFd+nmO2p7VWr3isGu8kiugTS81sWtuQxakR6tcJypKlR2wzOHoxrru9FLBLWjVfRl/5DfHJ6UHYChw8f70mP2wl9H91j5+0W1y914kopQ5d1mfA76mM7QA9g2UdJUHzv7IDUdgClMFucbnSiYLA/Dux1gDIGKc055G+wkM6q9pl5fvghJh2Om2Tv/nZEB/WRl97kN2SuQMeJeQWDegdtWp0Jree01rrBsNeGuTzgCY0JofkmvjBKwiyza2bGl5PlgjCb+DznNO4gM7V3lyZwoiPyX1SER5ks8hqrCWHI2pcX7/+5SLAOYW0antLdAJQg/048YxPLYJnjZQnmOPxmQdyOWUQuz16nI3YTuDJ9RKPW3QUbpzchJUg7KLHOpGG59ltgOHnast4UuSMppKrf133satp742j0KPifeP6o+QmKK1BLgeq40lnWvOWflll+9ZcDuu3ImBZPQFk87o+2Fnk8be4+I8QOxyVWBL+8TUd6hPynsK0yjRcIYcd5OB7LdgPO4eOvs0nAdC077Z1YuZ/BsfIw6W6rd71IOZyRjhHqHJEMlBjUWFFhYXO+P4rPYj4GGwSE/sA37Y9ipxXHYyi+7cnUJnXOrGOuI/mmysb8heZuKveJ3KqJhnVjR+A3rKiwF13MQLGtiPQJAHCyAXG61w3h7dBJpkCZrhu1WjYuTOBSPZ1AJtRLIQM4wKrDpkzLoXJ9DJMmpa7FCD7usCnPzsL8Tv+7WihWWxs4Oa6mZSLK/ubt/Tu2hLR2xuARGMmBxvmFRElH4vrGYwRUbNr10MeRYAUTzsBfinTZWdSQe5bJvyL+oyesWbMWqCbOdjUkkHWGwp5xHg1klahPxoVT5ou37v6jeaIJwgAS1Wcy1JTeiWwgmg/918BCkZ+ZxfyqL5k9KKKkI7ZN1jN6hFt5X+EIzz3qs1xhldqH21PM59M0U7UqAMoBuM6euw==--E9LI/t7jna5rKa95--4MK/MVBXsINLUbAgV9fNJg==