Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 9 deletions

diff --git a/app/controllers/jira_connect/app_descriptor_controller.rb b/app/controllers/jira_connect/app_descriptor_controller.rb
index ec3327cc20e..a0f387631dd 100644
--- a/app/controllers/jira_connect/app_descriptor_controller.rb
+++ b/app/controllers/jira_connect/app_descriptor_controller.rb
@@ -65,17 +65,13 @@ class JiraConnect::AppDescriptorController < JiraConnect::ApplicationController
 
   # See https://developer.atlassian.com/cloud/jira/software/modules/development-tool/
   def development_tool_module
-    actions = {}
-
-    if JiraConnect::BranchesController.feature_enabled?(current_user)
-      actions[:createBranch] = {
-        templateUrl: new_jira_connect_branch_url + '?issue_key={issue.key}&issue_summary={issue.summary}'
-      }
-    end
-
     {
       jiraDevelopmentTool: {
-        actions: actions,
+        actions: {
+          createBranch: {
+            templateUrl: new_jira_connect_branch_url + '?issue_key={issue.key}&issue_summary={issue.summary}'
+          }
+        },
         key: 'gitlab-development-tool',
         application: { value: 'GitLab' },
         name: { value: 'GitLab' },