summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/git
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-14 15:44:36 +0000
committerDouwe Maan <douwe@gitlab.com>2017-08-14 15:44:36 +0000
commita64760d6d0a9bc0ce0747de349d37f3c46a1c221 (patch)
treeef418c4bf1c6edd55a688f5ca8abc6e665fbf5a1 /spec/lib/gitlab/git
parent2857ed5f68dcd02f20e006180de39263e14a6e36 (diff)
parent7b10885046137633fa615ed5d6ba29d4d0d09cd7 (diff)
downloadgitlab-ce-a64760d6d0a9bc0ce0747de349d37f3c46a1c221.tar.gz
Merge branch 'gitaly-404-commit-list-files' into 'master'
Migrate `Git::Repository.ls_files` to Gitaly Closes gitaly#404 See merge request !13302
Diffstat (limited to 'spec/lib/gitlab/git')
-rw-r--r--spec/lib/gitlab/git/repository_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 04c86a2c1a7..8d24d6f55b8 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1002,7 +1002,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
expect(master_file_paths).to include("files/html/500.html")
end
- it "dose not read submodule directory and empty directory of master branch" do
+ it "does not read submodule directory and empty directory of master branch" do
expect(master_file_paths).not_to include("six")
end