diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-11 16:27:30 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-11 16:27:30 +0100 |
| commit | 0fe784cbfb56a701259d83c989341afb1b7bc124 (patch) | |
| tree | 099ec5f39984c031b2403f75b1958be93e46d882 /spec/models/project_spec.rb | |
| parent | 7d0a1285a10fcb4735c20e21d83367159402a06d (diff) | |
| parent | 27732df37178c3a07c99304406dfdb41fa8b3670 (diff) | |
| download | gitlab-ce-help-profiles-dispatcher-refactor.tar.gz | |
Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactor
Diffstat (limited to 'spec/models/project_spec.rb')
| -rw-r--r-- | spec/models/project_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 00afa09f1a3..78223c44999 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -1871,9 +1871,8 @@ describe Project do end it 'creates the new reference with rugged' do - expect(project.repository.rugged.references).to receive(:create).with('HEAD', - "refs/heads/#{project.default_branch}", - force: true) + expect(project.repository.raw_repository).to receive(:write_ref).with('HEAD', "refs/heads/#{project.default_branch}", shell: false) + project.change_head(project.default_branch) end |