Permalink
Browse files

version updated, gitosis removed

  • Loading branch information...
1 parent e14a0eb commit 3e581984fecca9ddfbed6082d8f6096c5ff48229 @randx randx committed Dec 5, 2011
Showing with 10 additions and 23 deletions.
  1. +5 −0 CHANGELOG
  2. +4 −19 README.md
  3. +1 −1 VERSION
  4. +0 −3 config/gitlab.yml
View
5 CHANGELOG
@@ -1,3 +1,8 @@
+v 2.0.0
+ - gitolite as main git host system
+ - merge requests
+ - bugfix
+
v 1.2.2
- common config file gitlab.yml
- issues restyle
View
23 README.md
@@ -9,15 +9,15 @@ GitLab is a free Project/Repository management application
## Application details
rails 3.1
-works only with gitosis
+works only with gitolite
sqlite as default a database
## Requirements
* ruby 1.9.2
* sqlite
* git
-* gitosis
+* gitolite
* ubuntu/debian
* pygments lib - `sudo easy_install pygments`
@@ -51,7 +51,7 @@ bundle exec rake db:setup RAILS_ENV=production
bundle exec rake db:seed_fu RAILS_ENV=production
```
-Install gitosis, edit `config/gitlab.yml` and start server
+Install gitolite (with repo umask 0007), edit `config/gitlab.yml` and start server
```bash
bundle exec rails s -e production
@@ -80,24 +80,9 @@ usermod -a -G git gitlabhq_user_name
### !!! IMPORTANT !!! Gitolite umask should be 0007 so users from git group has read/write access to repo
-## Install Gitosis
-
-```bash
-sudo aptitude install gitosis
-
-
-ssh-keygen -t rsa
-
-sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
-
-sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update
-
-cd /tmp && git clone git@localhost:gitosis-admin.git
-
-rm -rf gitosis-admin.git && cd
-
```
+
## Install ruby 1.9.2
```bash
View
2 VERSION
@@ -1 +1 @@
-1.2.2
+2.0.0
View
3 config/gitlab.yml
@@ -7,9 +7,6 @@ email:
host: gitlabhq.com
# Git Hosting congiguration
-# You can use both gitolite & gitosis
-# But gitosis wiil be deprecated &
-# some new features wont work with it
git_host:
system: gitolite
admin_uri: git@localhost:gitolite-admin

0 comments on commit 3e58198

Please sign in to comment.