Merge pull request #6205 from mdeniz/staging_workflow/fix_rebase_wron…

…gly_done Fix a wrongly merge in StagingWorkflowController
openSUSE · Nov 8, 2018 · 0df76a0 · 0df76a0
2 parents fd109e3 + 38020a4
commit 0df76a0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/api/app/controllers/webui/staging_workflows_controller.rb b/src/api/app/controllers/webui/staging_workflows_controller.rb
@@ -32,12 +32,6 @@ def create
 
   def show
     @project = @staging_workflow.project
-  end
-
-  def edit
-    authorize @staging_workflow
-
-    @project = @staging_workflow.project
     @unassigned_requests = @staging_workflow.unassigned_requests.first(5)
     @more_unassigned_requests = @staging_workflow.unassigned_requests.count - @unassigned_requests.size
     @ready_requests = @staging_workflow.ready_requests.first(5)
@@ -47,6 +41,12 @@ def edit
     @empty_projects = @staging_workflow.staging_projects.without_staged_requests
   end
 
+  def edit
+    authorize @staging_workflow
+
+    @project = @staging_workflow.project
+  end
+
   private
 
   def set_bootstrap_views