Commit 7c86c611 authored by Regis's avatar Regis

Merge branch 'master' into auto-pipelines-vue - fixes haml lint error

parents 40fb0d9e 7c2a4699
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.form-group .form-group
= f.label :email = f.label :email
= f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address." = f.email_field :email, class: "form-control middle", required: true, title: "Please provide a valid email address."
%div.form-group .form-group
= f.label :email_confirmation = f.label :email_confirmation
= f.email_field :email_confirmation, class: "form-control middle", required: true, title: "Please retype the email address." = f.email_field :email_confirmation, class: "form-control middle", required: true, title: "Please retype the email address."
.form-group.append-bottom-20#password-strength .form-group.append-bottom-20#password-strength
......
...@@ -12,13 +12,24 @@ to turn it off, go to **Admin area > Settings** ...@@ -12,13 +12,24 @@ to turn it off, go to **Admin area > Settings**
## Manual housekeeping ## Manual housekeeping
The housekeeping function runs `git gc` ([man page][man]) on the current The housekeeping function will run a `repack` or `gc` depending on the
project Git repository. "Automatic Git repository housekeeping" settings configured in **Admin area > Settings**
`git gc` runs a number of housekeeping tasks, such as compressing file For example in the following scenario a `git repack -d` will be executed:
revisions (to reduce disk space and increase performance) and removing
unreachable objects which may have been created from prior invocations of + Project: pushes since gc counter (`pushes_since_gc`) = `10`
`git add`. + Git GC period = `200`
+ Full repack period = `50`
When the `pushes_since_gc` value is 50 a `repack -A -d --pack-kept-objects` will run, similarly when
the `pushes_since_gc` value is 200 a `git gc` will be run.
+ `git gc` ([man page][man-gc]) runs a number of housekeeping tasks,
such as compressing filerevisions (to reduce disk space and increase performance)
and removing unreachable objects which may have been created from prior invocations of
`git add`.
+ `git repack` ([man page][man-repack]) re-organize existing packs into a single, more efficient pack.
You can find this option under your **[Project] > Edit Project**. You can find this option under your **[Project] > Edit Project**.
...@@ -27,4 +38,5 @@ You can find this option under your **[Project] > Edit Project**. ...@@ -27,4 +38,5 @@ You can find this option under your **[Project] > Edit Project**.
![Housekeeping settings](img/housekeeping_settings.png) ![Housekeeping settings](img/housekeeping_settings.png)
[ce-2371]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2371 "Housekeeping merge request" [ce-2371]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2371 "Housekeeping merge request"
[man]: https://www.kernel.org/pub/software/scm/git/docs/git-gc.html "git gc man page" [man-gc]: https://www.kernel.org/pub/software/scm/git/docs/git-gc.html "git gc man page"
[man-repack]: https://www.kernel.org/pub/software/scm/git/docs/git-repack.html
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment