Merge branch 'main' of github.com:MushroomObserver/mushroom-observer …

…into generalize-runners
MushroomObserver · Feb 29, 2024 · caea6b5 · caea6b5
2 parents 068914c + e1fabaa
commit caea6b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/models/naming.rb b/app/models/naming.rb
@@ -72,7 +72,7 @@ def self.construct(args, observation)
     naming = Naming.new(args)
     naming.created_at = now
     naming.updated_at = now
-    naming.user = @user
+    naming.user = User.current
     naming.observation = observation
     naming
   end

diff --git a/app/models/vote.rb b/app/models/vote.rb
@@ -78,7 +78,7 @@ def self.construct(args, naming)
     vote.assign_attributes(args.permit(:favorite, :value)) if args
     vote.created_at = now
     vote.updated_at = now
-    vote.user = @user
+    vote.user = User.current
     vote.naming = naming
     vote.observation = naming.observation
     vote

diff --git a/script/deploy.sh b/script/deploy.sh
@@ -29,8 +29,8 @@ echo Installing bundle... && bundle install && \
 echo Checking for migrations... && rake db:migrate && \
 echo Updating translations... && rake lang:update && \
 echo Precompiling assets... && rake assets:precompile && \
-# echo Reloading unicorn... && sudo system unicorn reload && \
-echo Reloading puma... && sudo system puma restart && \
+# echo Reloading unicorn... && sudo service unicorn reload && \
+echo Reloading puma... && sudo service puma restart && \
 echo Tagging repo with $tag... && git tag $tag && \
 echo Pushing new tag... && git push --tags && \
 echo SUCCESS\!