diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-27 03:53:31 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-27 03:53:31 +0300 |
commit | 843694f90270e290f164bed68362500c9e331a46 (patch) | |
tree | 0e20cc09df536365db817ba8aef4c77d3d0c684e /doc | |
parent | 6afd69f4445cc0688aa1695389eb3f79033e3121 (diff) | |
parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'doc')
-rw-r--r-- | doc/reply_by_email/README.md | 4 | ||||
-rw-r--r-- | doc/workflow/importing/README.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md index 91eea956e52..5d36f5121d1 100644 --- a/doc/reply_by_email/README.md +++ b/doc/reply_by_email/README.md @@ -59,6 +59,8 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you' :name: "inbox" # Always "sidekiq". :delivery_method: sidekiq + # Always true. + :delete_after_delivery: true :delivery_options: # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml. :redis_url: redis://localhost:6379 @@ -144,6 +146,8 @@ TODO :name: "inbox" # Always "sidekiq". :delivery_method: sidekiq + # Always true. + :delete_after_delivery: true :delivery_options: # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml. :redis_url: redis://localhost:6379 diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md index cd98d1b9852..5cde90993d2 100644 --- a/doc/workflow/importing/README.md +++ b/doc/workflow/importing/README.md @@ -8,5 +8,5 @@ ### Note
* If you'd like to migrate from a self-hosted GitLab instance to GitLab.com, you can copy your repos by changing the remote and pushing to the new server; but issues and merge requests can't be imported.
-* Repositories are imported to GitLab via HTTP.
-If the repository is too large, it can timeout. We have a soft limit of 10GB.
+* You can import any Git repository via HTTP from the New Project page.
+If the repository is too large, it can timeout.
|