Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 19 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' },
diff --git a/app/controllers/jira_connect/branches_controller.rb b/app/controllers/jira_connect/branches_controller.rb
index 97d0b75639e..12ea6560e3a 100644
--- a/app/controllers/jira_connect/branches_controller.rb
+++ b/app/controllers/jira_connect/branches_controller.rb
@@ -3,18 +3,12 @@
 # NOTE: This controller does not inherit from JiraConnect::ApplicationController
 # because we don't receive a JWT for this action, so we rely on standard GitLab authentication.
 class JiraConnect::BranchesController < ApplicationController
-  before_action :feature_enabled!
-
   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
@@ -32,8 +26,4 @@ class JiraConnect::BranchesController < ApplicationController
       success_state_svg_path: ActionController::Base.helpers.image_path('illustrations/merge_requests.svg')
     }
   end
-
-  def feature_enabled!
-    render_404 unless self.class.feature_enabled?(current_user)
-  end
 end