diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-06 15:00:26 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-06 15:00:26 -0500 |
| commit | 792f6ed16fbbbfcb7badc00ab3bffa7498bb6407 (patch) | |
| tree | 40250aa0b51e7e3ca560a8106f8c084ffa130674 /spec/helpers/blob_helper_spec.rb | |
| parent | 1065ba4097bd50720ef8777d05c36f2e79048d46 (diff) | |
| parent | 00e00cacf8cb4ce3bfb733bae47e7e594e91e294 (diff) | |
| download | gitlab-ce-792f6ed16fbbbfcb7badc00ab3bffa7498bb6407.tar.gz | |
Merge branch 'master' into new-resolvable-discussion
# Conflicts:
# app/assets/javascripts/filtered_search/dropdown_hint.js
# app/views/shared/issuable/_search_bar.html.haml
Diffstat (limited to 'spec/helpers/blob_helper_spec.rb')
| -rw-r--r-- | spec/helpers/blob_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb index bead7948486..508aeb7cf67 100644 --- a/spec/helpers/blob_helper_spec.rb +++ b/spec/helpers/blob_helper_spec.rb @@ -73,7 +73,7 @@ describe BlobHelper do let(:project) { create(:project, :repository, namespace: namespace) } before do - allow(self).to receive(:current_user).and_return(double) + allow(self).to receive(:current_user).and_return(nil) allow(self).to receive(:can_collaborate_with_project?).and_return(true) end |