diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | README.md | 23 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | config/gitlab.yml | 3 |
4 files changed, 10 insertions, 23 deletions
diff --git a/CHANGELOG b/CHANGELOG index d5e2d118de0..47471a65a9e 100644 --- a/CHANGELOG +++ b/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 diff --git a/README.md b/README.md index 12a0aba709c..48bbcc270b3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ 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 @@ -17,7 +17,7 @@ sqlite as default a database * 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 @@ -1 +1 @@ -1.2.2 +2.0.0 diff --git a/config/gitlab.yml b/config/gitlab.yml index e861031e5ee..5d40b2b3440 100644 --- a/config/gitlab.yml +++ b/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 |