Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 7 deletions

diff --git a/spec/frontend/fixtures/autocomplete_sources.rb b/spec/frontend/fixtures/autocomplete_sources.rb
index 382eff02b0f..812364c8b06 100644
--- a/spec/frontend/fixtures/autocomplete_sources.rb
+++ b/spec/frontend/fixtures/autocomplete_sources.rb
@@ -5,10 +5,10 @@ require 'spec_helper'
 describe Projects::AutocompleteSourcesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
-  set(:admin) { create(:admin) }
-  set(:group) { create(:group, name: 'frontend-fixtures') }
-  set(:project) { create(:project, namespace: group, path: 'autocomplete-sources-project') }
-  set(:issue) { create(:issue, project: project) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:group) { create(:group, name: 'frontend-fixtures') }
+  let_it_be(:project) { create(:project, namespace: group, path: 'autocomplete-sources-project') }
+  let_it_be(:issue) { create(:issue, project: project) }
 
   before(:all) do
     clean_frontend_fixtures('autocomplete_sources/')
diff --git a/spec/frontend/fixtures/commit.rb b/spec/frontend/fixtures/commit.rb
index 2c4bf6fbd3d..c9a5aa9a67c 100644
--- a/spec/frontend/fixtures/commit.rb
+++ b/spec/frontend/fixtures/commit.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
-  set(:project)  { create(:project, :repository) }
-  set(:user)     { create(:user) }
-  let(:commit)   { project.commit("master") }
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user)    { create(:user) }
+  let(:commit)        { project.commit("master") }
 
   render_views