diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 11:17:43 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-08 11:17:43 +0000 |
| commit | 1490d65e4541f8fdf4fc8257b0621bdd750dd904 (patch) | |
| tree | 2e44f30aa03a5c2ddc04f257b40c8fc60111d178 /spec | |
| parent | 1f98beba79b16fc0167f8b3396b58d047edade37 (diff) | |
| parent | dbffaaa97e7a195dc5421237392788a03a6b763a (diff) | |
| download | gitlab-ce-1490d65e4541f8fdf4fc8257b0621bdd750dd904.tar.gz | |
Merge branch 'blob-load-all-data' into 'master'
Blob#load_all_data! doesn’t need an argument
See merge request !11977
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/requests/git_http_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb index f018b48ceb2..c09be0ce1b9 100644 --- a/spec/requests/git_http_spec.rb +++ b/spec/requests/git_http_spec.rb @@ -648,7 +648,7 @@ describe 'Git HTTP requests', lib: true do # Provide a dummy file in its place allow_any_instance_of(Repository).to receive(:blob_at).and_call_original allow_any_instance_of(Repository).to receive(:blob_at).with('b83d6e391c22777fca1ed3012fce84f633d7fed0', 'info/refs') do - Gitlab::Git::Blob.find(project.repository, 'master', 'bar/branch-test.txt') + Blob.decorate(Gitlab::Git::Blob.find(project.repository, 'master', 'bar/branch-test.txt'), project) end get "/#{project.path_with_namespace}/blob/master/info/refs" |