summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-09-07 00:23:11 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-09-07 00:23:11 -0700
commit71d31a38fc73252a76076820c63d054a8047d667 (patch)
tree926a7a429471a1fbf99046428f2d2b19c325a749
parent201158f1dee15accf6abbd7ad5a50af023ba5d23 (diff)
parent24bc3e0874bd81d1cf8cc8a7104f277d5a9fa5c7 (diff)
downloadgitlab-ce-71d31a38fc73252a76076820c63d054a8047d667.tar.gz
Merge pull request #5013 from clayzermk1/master
Import Bare Repositories instructions/description are incorrect
-rw-r--r--doc/raketasks/maintenance.md2
-rw-r--r--lib/tasks/gitlab/import.rake4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 68c1a72b230..3033d8c46b4 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -122,7 +122,7 @@ Notes:
How to use:
-1. copy your bare repos under git base_path (see `config/gitlab.yml` git_host -> base_path)
+1. copy your bare repos under git repos_path (see `config/gitlab.yml` gitlab_shell -> repos_path)
2. run the command below
```
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index 668ef1d2300..8fa89270854 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -2,14 +2,14 @@ namespace :gitlab do
namespace :import do
# How to use:
#
- # 1. copy your bare repos under git base_path
+ # 1. copy your bare repos under git repos_path
# 2. run bundle exec rake gitlab:import:repos RAILS_ENV=production
#
# Notes:
# * project owner will be a first admin
# * existing projects will be skipped
#
- desc "GITLAB | Import bare repositories from git_host -> base_path into GitLab project instance"
+ desc "GITLAB | Import bare repositories from gitlab_shell -> repos_path into GitLab project instance"
task repos: :environment do
git_base_path = Gitlab.config.gitlab_shell.repos_path