diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 19:03:27 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 19:03:27 +0000 |
| commit | b8485707f268e95b28ef051cc5a4250df22cd13b (patch) | |
| tree | 882a11d3ac70c1eb3762ce8ee55866fdef438640 /spec/support/generate-seed-repo-rb | |
| parent | ab6bf68c4ed62a487fa7e6390462c32bf836c8d6 (diff) | |
| parent | f0ac0daf6a8788f57b98eaf29b0056899027ae68 (diff) | |
| download | gitlab-ce-b8485707f268e95b28ef051cc5a4250df22cd13b.tar.gz | |
Fix conflictdocs-article-undo-things-in-git
Merge branch 'master' into 'docs-article-undo-things-in-git'
# Conflicts:
# doc/articles/index.md
Diffstat (limited to 'spec/support/generate-seed-repo-rb')
| -rwxr-xr-x | spec/support/generate-seed-repo-rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/support/generate-seed-repo-rb b/spec/support/generate-seed-repo-rb index c89389b90ca..ef3c8e7087f 100755 --- a/spec/support/generate-seed-repo-rb +++ b/spec/support/generate-seed-repo-rb @@ -1,16 +1,16 @@ #!/usr/bin/env ruby -# +# # # generate-seed-repo-rb -# +# # This script generates the seed_repo.rb file used by lib/gitlab/git # tests. The seed_repo.rb file needs to be updated anytime there is a # Git push to https://gitlab.com/gitlab-org/gitlab-git-test. -# +# # Usage: -# +# # ./spec/support/generate-seed-repo-rb > spec/support/seed_repo.rb -# -# +# +# require 'erb' require 'tempfile' |