Merge branch 'master' into feat-addd-custom-themes

SnippetSafe · Mar 21, 2021 · ed51e40 · ed51e40
2 parents 9623507 + bc1007e
commit ed51e40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/modals/snippets_controller.rb b/app/controllers/modals/snippets_controller.rb
@@ -11,7 +11,7 @@ def new
   def edit
     @languages = Language.order(name: :asc)
     @folders = current_user.folders
-    @folder = current_user.snippet_folders.find_by(snippet_id: params[:id]).folder
+    @folder = current_user.snippet_folders.find_by(snippet_id: @snippet.id).folder
   end
 
   def move

diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
@@ -1,5 +1,6 @@
 class RegistrationsController < Devise::RegistrationsController
   layout 'basic'
+  layout 'application', only: :edit
 
   def new
     @user = User.new