Merge remote-tracking branch 'upstream/pull/4867'

[rails.git] / app / controllers / redactions_controller.rb

diff --git a/app/controllers/redactions_controller.rb b/app/controllers/redactions_controller.rb
index 30425bd429babe42827509eb30c331e00a4cc3d1..6e28f36253f0dd0e80e3cae51ddae793e6bbcbd8 100644 (file)
--- a/app/controllers/redactions_controller.rb
+++ b/app/controllers/redactions_controller.rb
@@ -14,10 +14,14 @@ class RedactionsController < ApplicationController
     @redactions = Redaction.order(:id)
   end
 
     @redactions = Redaction.order(:id)
   end
 

+  def show; end
+

   def new
     @redaction = Redaction.new
   end
 
   def new
     @redaction = Redaction.new
   end
 

+  def edit; end
+

   def create
     @redaction = Redaction.new
     @redaction.user = current_user
   def create
     @redaction = Redaction.new
     @redaction.user = current_user


@@ -33,10 +37,6 @@ class RedactionsController < ApplicationController
     end
   end
 
     end
   end
 

-  def show; end
-
-  def edit; end
-

   def update
     # NOTE: don't update the user ID
     @redaction.title = params[:redaction][:title]
   def update
     # NOTE: don't update the user ID
     @redaction.title = params[:redaction][:title]