Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index add249e2c74..d92862f0ca3 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -334,7 +334,7 @@ RSpec.describe Projects::NotesController do
 
     before do
       project.update_attribute(:visibility_level, project_visibility)
-      project.project_feature.update(merge_requests_access_level: merge_requests_access_level)
+      project.project_feature.update!(merge_requests_access_level: merge_requests_access_level)
       sign_in(user)
     end
 
@@ -917,7 +917,7 @@ RSpec.describe Projects::NotesController do
 
         context "when the note is not resolvable" do
           before do
-            note.update(system: true)
+            note.update!(system: true)
           end
 
           it "returns status 404" do
@@ -980,7 +980,7 @@ RSpec.describe Projects::NotesController do
 
         context "when the note is not resolvable" do
           before do
-            note.update(system: true)
+            note.update!(system: true)
           end
 
           it "returns status 404" do