Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 12 deletions

diff --git a/spec/services/environments/stop_service_spec.rb b/spec/services/environments/stop_service_spec.rb
index 6cfbd765785..afbc0ba70f9 100644
--- a/spec/services/environments/stop_service_spec.rb
+++ b/spec/services/environments/stop_service_spec.rb
@@ -223,18 +223,6 @@ RSpec.describe Environments::StopService do
 
           expect(prepare_staging_job.persisted_environment.state).to eq('available')
         end
-
-        context 'when fix_related_environments_for_merge_requests feature flag is disabled' do
-          before do
-            stub_feature_flags(fix_related_environments_for_merge_requests: false)
-          end
-
-          it 'stops unrelated environments too' do
-            subject
-
-            expect(prepare_staging_job.persisted_environment.state).to eq('stopped')
-          end
-        end
       end
     end
 
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index 6b7b72d83fc..3934ca04a00 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -47,6 +47,14 @@ RSpec.describe Issues::CreateService do
           due_date: Date.tomorrow }
       end
 
+      it 'works if base work item types were not created yet' do
+        WorkItems::Type.delete_all
+
+        expect do
+          issue
+        end.to change(Issue, :count).by(1)
+      end
+
       it 'creates the issue with the given params' do
         expect(Issuable::CommonSystemNotesService).to receive_message_chain(:new, :execute)