diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
commit | 35659da185e3c6ec2862884b4e9e19dd20445957 (patch) | |
tree | 4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /spec/support/seed_repo.rb | |
parent | 1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff) | |
parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
download | gitlab-ce-fix-btn-alignment.tar.gz |
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts:
# app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'spec/support/seed_repo.rb')
-rw-r--r-- | spec/support/seed_repo.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/seed_repo.rb b/spec/support/seed_repo.rb index cfe7fc980a8..b4868e82cd7 100644 --- a/spec/support/seed_repo.rb +++ b/spec/support/seed_repo.rb @@ -97,6 +97,7 @@ module SeedRepo gitattributes-updated master merge-test + missing-gitmodules ].freeze TAGS = %w[ v1.0.0 |