Download as
Browse Code »

Commit d0646babdbb54c652ce19e6329b904193be8522c

Authored by Dmitriy Zaporozhets
1 parent f17fe7ff
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove gitolite mention from docs

Showing 4 changed files with 9 additions and 41 deletions   Show diff stats
doc/raketasks/backup_restore.md
  Diff comments   View file @d0646ba
... ... @@ -31,7 +31,6 @@ Dumping database tables:
31 31 - Dumping table wikis... [DONE]
32 32 Dumping repositories:
33 33 - Dumping repository abcd... [DONE]
34   -- Dumping repository gitolite-admin.git... [DONE]
35 34 Creating backup archive: $TIMESTAMP_gitlab_backup.tar [DONE]
36 35 Deleting tmp directories...[DONE]
37 36 Deleting old backups... [SKIPPING]
... ... @@ -77,6 +76,5 @@ Restoring database tables:
77 76 - Loading fixture wikis...[SKIPPING]
78 77 Restoring repositories:
79 78 - Restoring repository abcd... [DONE]
80   -- Restoring repository gitolite-admin.git... [DONE]
81 79 Deleting tmp directories...[DONE]
82 80 ```
... ...
doc/raketasks/cleanup.md
  Diff comments   View file @d0646ba
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!
8 2  
9 3 Remove namespaces(dirs) from /home/git/repositories if they dont exist in GitLab database
10 4  
... ...
doc/raketasks/features.md
  Diff comments   View file @d0646ba
... ... @@ -17,12 +17,12 @@ bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
17 17 ```
18 18  
19 19  
20   -### Enable auto merge
  20 +### Rebuild project satellites
21 21  
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**.
23 23  
24 24 ```
25   -bundle exec rake gitlab:enable_automerge RAILS_ENV=production
  25 +bundle exec rake gitlab:satellites:create RAILS_ENV=production
26 26 ```
27 27  
28 28 Example output:
... ...
doc/raketasks/maintenance.md
  Diff comments   View file @d0646ba
... ... @@ -31,12 +31,10 @@ SSH Clone URL: git@localhost:some-project.git
31 31 Using LDAP: no
32 32 Using Omniauth: no
33 33  
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
38 36 Repositories: /home/git/repositories/
39   -Hooks: /home/git/.gitolite/hooks/
  37 +Hooks: /home/git/gitlab-shell/hooks/
40 38 Git: /usr/bin/git
41 39 ```
42 40  
... ... @@ -46,8 +44,8 @@ Git: /usr/bin/git
46 44 Runs the following rake tasks:
47 45  
48 46 * gitlab:env:check
49   -* gitlab:gitolite:check
50   -* gitlab:resque:check
  47 +* gitlab:gitlab_shell:check
  48 +* gitlab:sidekiq:check
51 49 * gitlab:app:check
52 50  
53 51 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
74 72 Checking Gitolite ...
75 73  
76 74 Using recommended version ... yes
77   -Repo umask is 0007 in .gitolite.rc? ... yes
78   -Allow all Git config keys in .gitolite.rc ... yes
79 75 Config directory exists? ... yes
80 76 Config directory owned by git:git? ... yes
81 77 Config directory access is drwxr-x---? ... yes
82 78 Repo base directory exists? ... yes
83 79 Repo base owned by git:git? ... yes
84 80 Repo base access is drwxrws---? ... yes
85   -Can clone gitolite-admin? ... yes
86   -Can commit to gitolite-admin? ... yes
87 81 post-receive hook exists? ... yes
88 82 post-receive hook up-to-date? ... yes
89 83 post-receive hooks in repos are links: ...
... ... @@ -135,24 +129,6 @@ If necessary, remove the `tmp/repo_satellites` directory and rerun the command b
135 129 bundle exec rake gitlab:satellites:create RAILS_ENV=production
136 130 ```
137 131  
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   -
156 132 ### Import bare repositories into GitLab project instance
157 133  
158 134 Notes:
... ...