Skip to content

Commit d0646ba

Browse files
committed
Remove gitolite mention from docs
1 parent f17fe7f commit d0646ba

File tree

4 files changed

+9
-41
lines changed

4 files changed

+9
-41
lines changed

Diff for: doc/raketasks/backup_restore.md

-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Dumping database tables:
3131
- Dumping table wikis... [DONE]
3232
Dumping repositories:
3333
- Dumping repository abcd... [DONE]
34-
- Dumping repository gitolite-admin.git... [DONE]
3534
Creating backup archive: $TIMESTAMP_gitlab_backup.tar [DONE]
3635
Deleting tmp directories...[DONE]
3736
Deleting old backups... [SKIPPING]
@@ -77,6 +76,5 @@ Restoring database tables:
7776
- Loading fixture wikis...[SKIPPING]
7877
Restoring repositories:
7978
- Restoring repository abcd... [DONE]
80-
- Restoring repository gitolite-admin.git... [DONE]
8179
Deleting tmp directories...[DONE]
8280
```

Diff for: doc/raketasks/cleanup.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
### Remove grabage from gitolite config and filesystem. Important! Data loss!
2-
3-
Remove projects from gitolite config if they dont exist in GitLab database
4-
5-
```
6-
bundle exec rake gitlab:cleanup:config RAILS_ENV=production
7-
```
1+
### Remove grabage from filesystem. Important! Data loss!
82

93
Remove namespaces(dirs) from /home/git/repositories if they dont exist in GitLab database
104

Diff for: doc/raketasks/features.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
1717
```
1818

1919

20-
### Enable auto merge
20+
### Rebuild project satellites
2121

22-
This command will enable the auto merge feature. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
22+
This command will build missing satellites for projects. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
2323

2424
```
25-
bundle exec rake gitlab:enable_automerge RAILS_ENV=production
25+
bundle exec rake gitlab:satellites:create RAILS_ENV=production
2626
```
2727

2828
Example output:

Diff for: doc/raketasks/maintenance.md

+5-29
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ SSH Clone URL: git@localhost:some-project.git
3131
Using LDAP: no
3232
Using Omniauth: no
3333
34-
Gitolite information
35-
Version: v3.04-4-g4524f01
36-
Admin URI: git@localhost:gitolite-admin
37-
Admin Key: gitlab
34+
GitLab Shell
35+
Version: 1.0.4
3836
Repositories: /home/git/repositories/
39-
Hooks: /home/git/.gitolite/hooks/
37+
Hooks: /home/git/gitlab-shell/hooks/
4038
Git: /usr/bin/git
4139
```
4240

@@ -46,8 +44,8 @@ Git: /usr/bin/git
4644
Runs the following rake tasks:
4745

4846
* gitlab:env:check
49-
* gitlab:gitolite:check
50-
* gitlab:resque:check
47+
* gitlab:gitlab_shell:check
48+
* gitlab:sidekiq:check
5149
* gitlab:app:check
5250

5351
It will check that each component was setup according to the installation guide and suggest fixes for issues found.
@@ -74,16 +72,12 @@ Checking Environment ... Finished
7472
Checking Gitolite ...
7573
7674
Using recommended version ... yes
77-
Repo umask is 0007 in .gitolite.rc? ... yes
78-
Allow all Git config keys in .gitolite.rc ... yes
7975
Config directory exists? ... yes
8076
Config directory owned by git:git? ... yes
8177
Config directory access is drwxr-x---? ... yes
8278
Repo base directory exists? ... yes
8379
Repo base owned by git:git? ... yes
8480
Repo base access is drwxrws---? ... yes
85-
Can clone gitolite-admin? ... yes
86-
Can commit to gitolite-admin? ... yes
8781
post-receive hook exists? ... yes
8882
post-receive hook up-to-date? ... yes
8983
post-receive hooks in repos are links: ...
@@ -135,24 +129,6 @@ If necessary, remove the `tmp/repo_satellites` directory and rerun the command b
135129
bundle exec rake gitlab:satellites:create RAILS_ENV=production
136130
```
137131

138-
139-
### Rebuild each key at gitolite config
140-
141-
This will send all users ssh public keys to gitolite and grant them access (based on their permission) to their projects.
142-
143-
```
144-
bundle exec rake gitlab:gitolite:update_keys RAILS_ENV=production
145-
```
146-
147-
148-
### Rebuild each project at gitolite config
149-
150-
This makes sure that all projects are present in gitolite and can be accessed.
151-
152-
```
153-
bundle exec rake gitlab:gitolite:update_repos RAILS_ENV=production
154-
```
155-
156132
### Import bare repositories into GitLab project instance
157133

158134
Notes:

0 commit comments

Comments
 (0)