Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 5 deletions

diff --git a/app/controllers/jira_connect/branches_controller.rb b/app/controllers/jira_connect/branches_controller.rb
index 7d7faae62a5..97d0b75639e 100644
--- a/app/controllers/jira_connect/branches_controller.rb
+++ b/app/controllers/jira_connect/branches_controller.rb
@@ -8,20 +8,31 @@ class JiraConnect::BranchesController < ApplicationController
   feature_category :integrations
 
   def new
+    @new_branch_data = new_branch_data
+  end
+
+  def self.feature_enabled?(user)
+    Feature.enabled?(:jira_connect_create_branch, user, default_enabled: :yaml)
+  end
+
+  private
+
+  def initial_branch_name
     return unless params[:issue_key].present?
 
-    @branch_name = Issue.to_branch_name(
+    Issue.to_branch_name(
       params[:issue_key],
       params[:issue_summary]
     )
   end
 
-  def self.feature_enabled?(user)
-    Feature.enabled?(:jira_connect_create_branch, user, default_enabled: :yaml)
+  def new_branch_data
+    {
+      initial_branch_name: initial_branch_name,
+      success_state_svg_path: ActionController::Base.helpers.image_path('illustrations/merge_requests.svg')
+    }
   end
 
-  private
-
   def feature_enabled!
     render_404 unless self.class.feature_enabled?(current_user)
   end