diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-12-26 15:03:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-12-26 16:25:55 +0000 |
| commit | 1e5e56c698740e049a3fcf7b578ac006d5deef42 (patch) | |
| tree | 19d70223083a60d00ca53785a853ad44702fbee0 /spec/services | |
| parent | ed6900caf107ad0fc4580ad7dc000284d91683d4 (diff) | |
| download | gitlab-ce-1e5e56c698740e049a3fcf7b578ac006d5deef42.tar.gz | |
Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file
Don't try to highlight and cache files hidden by .gitattributes entries.
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/merge_requests/merge_request_diff_cache_service_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb index 05cdbe5287a..35804d41b46 100644 --- a/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb +++ b/spec/services/merge_requests/merge_request_diff_cache_service_spec.rb @@ -11,6 +11,7 @@ describe MergeRequests::MergeRequestDiffCacheService do expect(Rails.cache).to receive(:read).with(cache_key).and_return({}) expect(Rails.cache).to receive(:write).with(cache_key, anything) allow_any_instance_of(Gitlab::Diff::File).to receive(:blob).and_return(double("text?" => true)) + allow_any_instance_of(Repository).to receive(:diffable?).and_return(true) subject.execute(merge_request) end |