diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-04 13:16:21 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-04 13:16:21 -0700 |
| commit | 7c86c6118c3c4f68cd9489b326e66b003e10a0e1 (patch) | |
| tree | d9bac9c6bdaa841be4f5827e4783ef55c9f6c7d6 | |
| parent | 40fb0d9e47c6f022f41ffb6aa6a1c8f80dbdaf0a (diff) | |
| parent | 7c2a4699b8bdd9d8abd193e4256694115b41fc07 (diff) | |
| download | gitlab-ce-7c86c6118c3c4f68cd9489b326e66b003e10a0e1.tar.gz | |
Merge branch 'master' into auto-pipelines-vue - fixes haml lint error
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 2 | ||||
| -rw-r--r-- | doc/administration/housekeeping.md | 26 |
2 files changed, 20 insertions, 8 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 681eb303b49..01ecf237925 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -15,7 +15,7 @@ .form-group = f.label :email = 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.email_field :email_confirmation, class: "form-control middle", required: true, title: "Please retype the email address." .form-group.append-bottom-20#password-strength diff --git a/doc/administration/housekeeping.md b/doc/administration/housekeeping.md index f846c06ca42..bb621b788f1 100644 --- a/doc/administration/housekeeping.md +++ b/doc/administration/housekeeping.md @@ -12,13 +12,24 @@ to turn it off, go to **Admin area > Settings** ## Manual housekeeping -The housekeeping function runs `git gc` ([man page][man]) on the current -project Git repository. +The housekeeping function will run a `repack` or `gc` depending on the +"Automatic Git repository housekeeping" settings configured in **Admin area > Settings** -`git gc` runs a number of housekeeping tasks, such as compressing file -revisions (to reduce disk space and increase performance) and removing -unreachable objects which may have been created from prior invocations of -`git add`. +For example in the following scenario a `git repack -d` will be executed: + ++ Project: pushes since gc counter (`pushes_since_gc`) = `10` ++ 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**. @@ -27,4 +38,5 @@ You can find this option under your **[Project] > Edit Project**.  [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 |