Merge branch 'master' into tag-archive

spec/commit_spec.rb

@@ -162,7 +162,7 @@ describe Gitlab::Git::Commit do
         end
         it { should have(3).elements }
-        it { should include("874797c3a73b60d2187ed6e2fcabd289ff75171e") }
+        it { should include("d14d6c0abdd253381df51a723d58691b2ee1ab08") }
         it { should_not include("eb49186cfa5c4338011f5f590fac11bd66c5c631") }
       end
@@ -225,7 +225,7 @@ describe Gitlab::Git::Commit do
           commits.map { |c| c.id }
         end
-        it { should have(27).elements }
+        it { should have(29).elements }
         it { should include(SeedRepo::Commit::ID) }
         it { should include(SeedRepo::Commit::PARENT_ID) }
         it { should include(SeedRepo::FirstCommit::ID) }
@@ -243,7 +243,7 @@ describe Gitlab::Git::Commit do
           commits.map { |c| c.id }
         end
-        it { should have(20).elements }
+        it { should have(22).elements }
         it { should include(SeedRepo::Commit::ID) }
         it { should include(SeedRepo::FirstCommit::ID) }
         it { should_not include(SeedRepo::LastCommit::ID) }

spec/repository_spec.rb

@@ -222,7 +222,7 @@ describe Gitlab::Git::Repository do
   end
   describe :commit_count do
-    it { repository.commit_count("master").should == 21 }
+    it { repository.commit_count("master").should == 23 }
     it { repository.commit_count("feature").should == 9 }
   end

spec/support/big_commit.rb

 # Seed repo:
+# 0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326 Merge branch 'lfs_pointers' into 'master'
+# 33bcff41c232a11727ac6d660bd4b0c2ba86d63d Add valid and invalid lfs pointers
 # 732401c65e924df81435deb12891ef570167d2e2 Update year in license file
 # b0e52af38d7ea43cf41d8a6f2471351ac036d6c9 Empty commit
 # 40f4a7a617393735a95a0bb67b08385bc1e7c66d Add ISO-8859-encoded file

spec/support/commit.rb

 # Seed repo:
+# 0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326 Merge branch 'lfs_pointers' into 'master'
+# 33bcff41c232a11727ac6d660bd4b0c2ba86d63d Add valid and invalid lfs pointers
 # 732401c65e924df81435deb12891ef570167d2e2 Update year in license file
 # b0e52af38d7ea43cf41d8a6f2471351ac036d6c9 Empty commit
 # 40f4a7a617393735a95a0bb67b08385bc1e7c66d Add ISO-8859-encoded file

spec/support/first_commit.rb

 # Seed repo:
+# 0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326 Merge branch 'lfs_pointers' into 'master'
+# 33bcff41c232a11727ac6d660bd4b0c2ba86d63d Add valid and invalid lfs pointers
 # 732401c65e924df81435deb12891ef570167d2e2 Update year in license file
 # b0e52af38d7ea43cf41d8a6f2471351ac036d6c9 Empty commit
 # 40f4a7a617393735a95a0bb67b08385bc1e7c66d Add ISO-8859-encoded file

spec/support/last_commit.rb

 # Seed repo:
+# 0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326 Merge branch 'lfs_pointers' into 'master'
+# 33bcff41c232a11727ac6d660bd4b0c2ba86d63d Add valid and invalid lfs pointers
 # 732401c65e924df81435deb12891ef570167d2e2 Update year in license file
 # b0e52af38d7ea43cf41d8a6f2471351ac036d6c9 Empty commit
 # 40f4a7a617393735a95a0bb67b08385bc1e7c66d Add ISO-8859-encoded file
@@ -23,11 +25,11 @@
 #
 module SeedRepo
   module LastCommit
-    ID = "732401c65e924df81435deb12891ef570167d2e2"
-    PARENT_ID = "b0e52af38d7ea43cf41d8a6f2471351ac036d6c9"
-    MESSAGE = "Update year in license file"
-    AUTHOR_FULL_NAME = "Rémy Coutable"
-    FILES = ["LICENSE"]
+    ID = "0e50ec4d3c7ce42ab74dda1d422cb2cbffe1e326"
+    PARENT_ID = "732401c65e924df81435deb12891ef570167d2e2"
+    MESSAGE = "Merge branch 'lfs_pointers' into 'master'"
+    AUTHOR_FULL_NAME = "Marin Jankovski"
+    FILES = ["files/lfs/archive-invalid.tar", "files/lfs/archive.rar", "files/lfs/file-invalid.zip", "files/lfs/image.jpg", "files/lfs/picture-invalid.png"]
     FILES_COUNT = FILES.count
   end
 end