4 0 stable (!10409) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

An error occurred while fetching the assigned milestone of the selected merge_request.

Closed gitlab-qa-bot requested to merge 4-0-stable into master 8 years ago

Viewing commit 0e2880b7

Show latest version

4 files

+ 101

− 100

Files

4

0e2880b7

Backport fixes to the check and info tasks · 0e2880b7
Riyad Preukschas authored 12 years ago

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

config/gitlab.yml.example

+ 1

− 0

@@ -89,6 +89,7 @@ backup:

@@ -89,6 +89,7 @@ backup:

## Gitolite settings

## Gitolite settings

gitolite:

gitolite:

admin_uri: git@localhost:gitolite-admin

admin_uri: git@localhost:gitolite-admin

# repos_path must not be a symlink

repos_path: /home/git/repositories/

repos_path: /home/git/repositories/

hooks_path: /home/git/.gitolite/hooks/

hooks_path: /home/git/.gitolite/hooks/

admin_key: gitlab

admin_key: gitlab