Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 38 deletions

diff --git a/spec/controllers/projects/discussions_controller_spec.rb b/spec/controllers/projects/discussions_controller_spec.rb
index 8251b963563..bf4557dbd8a 100644
--- a/spec/controllers/projects/discussions_controller_spec.rb
+++ b/spec/controllers/projects/discussions_controller_spec.rb
@@ -162,19 +162,6 @@ RSpec.describe Projects::DiscussionsController, feature_category: :team_planning
           expect(note.reload.resolved_at).not_to be_nil
           expect(response).to have_gitlab_http_status(:ok)
         end
-
-        context 'when resolvable_issue_threads is disabled' do
-          before do
-            stub_feature_flags(resolvable_issue_threads: false)
-          end
-
-          it 'does not resolve the discussion and returns status 404' do
-            post :resolve, params: request_params
-
-            expect(note.reload.resolved_at).to be_nil
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
-        end
       end
     end
   end
@@ -261,19 +248,6 @@ RSpec.describe Projects::DiscussionsController, feature_category: :team_planning
           expect(note.reload.resolved_at).to be_nil
           expect(response).to have_gitlab_http_status(:ok)
         end
-
-        context 'when resolvable_issue_threads is disabled' do
-          before do
-            stub_feature_flags(resolvable_issue_threads: false)
-          end
-
-          it 'does not unresolve the discussion and returns status 404' do
-            delete :unresolve, params: request_params
-
-            expect(note.reload.resolved_at).not_to be_nil
-            expect(response).to have_gitlab_http_status(:not_found)
-          end
-        end
       end
     end
   end
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 5024698a769..eb05b39a7de 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -1797,18 +1797,6 @@ RSpec.describe Projects::IssuesController, :request_store, feature_category: :te
         expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable commit_id for_commit project_id confidential resolve_path resolved resolved_at resolved_by resolved_by_push])
       end
 
-      context 'when resolvable_issue_threads is disabled' do
-        before do
-          stub_feature_flags(resolvable_issue_threads: false)
-        end
-
-        it 'returns discussion json without resolved fields' do
-          get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid }
-
-          expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable commit_id for_commit project_id confidential])
-        end
-      end
-
       it 'renders the author status html if there is a status' do
         create(:user_status, user: discussion.author)