diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-12 21:37:04 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-12 21:37:04 +0200 |
commit | 2f2ad9eaf06e4573da77f9602fa9678711dba4d9 (patch) | |
tree | 0f0eb102b146da8358ec1ba0c81bf0498cdee4bd /spec/requests/git_http_spec.rb | |
parent | 2e3bc85421ddfc814e81f75e3adb8a8c1d53093e (diff) | |
parent | 58e2b44afe535100508eb4d49d7e7df24e408383 (diff) | |
download | gitlab-ce-feature/improve-mrwbs-and-todos-for-pipelines.tar.gz |
Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelines
* master:
Update health_check gem to `~> 2.2.0`
API: Version information
Revert "Merge branch 'tests-use-tmpfs' into 'master'"
Added documentation chapter for Git attributes
Use activerecord_sane_schema_dumper
Add a separate stage for bundle check
Add a bundle check step to ensure dependencies are correct
Create a new /templates API namespace
Add disabled delete button to protected branches
Make spec deterministic
refactors tests because of gitlab-test repository changes
Addresses Robert's feedback
Speed up specs for GET /projects/:id/events
API: New /users/:id/events endpoint
writes tests to verify the issue is solved and fixes breaking issues.
removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry
Diffstat (limited to 'spec/requests/git_http_spec.rb')
-rw-r--r-- | spec/requests/git_http_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/git_http_spec.rb b/spec/requests/git_http_spec.rb index 413d06715b3..5a1ed7d4a25 100644 --- a/spec/requests/git_http_spec.rb +++ b/spec/requests/git_http_spec.rb @@ -439,8 +439,8 @@ describe 'Git HTTP requests', lib: true do before 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('5937ac0a7beb003549fc5fd26fc247adbce4a52e', 'info/refs') do - Gitlab::Git::Blob.find(project.repository, 'master', '.gitignore') + 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') end get "/#{project.path_with_namespace}/blob/master/info/refs" |