summaryrefslogtreecommitdiff
path: root/spec/services/git
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 09:07:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 09:07:49 +0000
commit0ba3a054d2190094ffda1ebe3aa53ffc5b92247d (patch)
tree8462503456eb030bb1042c6af73edc8f8af49fc6 /spec/services/git
parentb24ae1cbc66e5b0f622393bcf2c59711750161ea (diff)
downloadgitlab-ce-0ba3a054d2190094ffda1ebe3aa53ffc5b92247d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/git')
-rw-r--r--spec/services/git/branch_push_service_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb
index e7f005cff0b..4d7ec7ac1d8 100644
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
@@ -5,8 +5,8 @@ require 'spec_helper'
describe Git::BranchPushService, services: true do
include RepoHelpers
- set(:user) { create(:user) }
- set(:project) { create(:project, :repository) }
+ let_it_be(:user) { create(:user) }
+ let_it_be(:project, reload: true) { create(:project, :repository) }
let(:blankrev) { Gitlab::Git::BLANK_SHA }
let(:oldrev) { sample_commit.parent_id }
let(:newrev) { sample_commit.id }