Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 26 deletions

diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb
index 0d9bd146778..9b13025cbe3 100644
--- a/spec/controllers/dashboard/projects_controller_spec.rb
+++ b/spec/controllers/dashboard/projects_controller_spec.rb
@@ -179,7 +179,7 @@ RSpec.describe Dashboard::ProjectsController, :aggregate_failures do
           expect(response).to render_template('dashboard/projects/index')
           expect(response.body).to include(
             "pushed to project",
-            "uploaded design #{design.to_reference}",
+            "added design #{design.to_reference}",
             "created wiki page #{wiki_page.title}",
             "joined project #{project.full_name}",
             "closed issue #{issue.to_reference}"
diff --git a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb
index 4a914239622..98f4db13a1d 100644
--- a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb
+++ b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb
@@ -86,18 +86,5 @@ RSpec.describe JiraConnect::AppDescriptorController do
         )
       )
     end
-
-    context 'when the jira_connect_create_branch feature is disabled' do
-      before do
-        stub_feature_flags(jira_connect_create_branch: false)
-      end
-
-      it 'does not include the create branch action' do
-        get :show
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(descriptor[:modules][:jiraDevelopmentTool][:actions]).not_to include(:createBranch)
-      end
-    end
   end
 end
diff --git a/spec/controllers/jira_connect/branches_controller_spec.rb b/spec/controllers/jira_connect/branches_controller_spec.rb
index 31f68608918..45daf3b5309 100644
--- a/spec/controllers/jira_connect/branches_controller_spec.rb
+++ b/spec/controllers/jira_connect/branches_controller_spec.rb
@@ -34,18 +34,6 @@ RSpec.describe JiraConnect::BranchesController do
         expect(response).to be_successful
         expect(assigns(:new_branch_data)).to include('initial_branch_name': nil)
       end
-
-      context 'when feature flag is disabled' do
-        before do
-          stub_feature_flags(jira_connect_create_branch: false)
-        end
-
-        it 'renders a 404 error' do
-          get :new
-
-          expect(response).to be_not_found
-        end
-      end
     end
 
     context 'when not logged in' do