home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-10-23 09:35:06 +03:00
parent 6683897a41 5093cb02d6
commit de46a5b602
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/profiles/accounts/show.html.haml
+1 -1
View File
@@ -45,7 +45,7 @@
Username
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
%p
Changing your username will change path to all personl projects!
Changing your username will change path to all personal projects!
%div
= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
 
doc/update/6.1-to-6.2.md
+2
View File
@@ -60,11 +60,13 @@ git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.examp
* Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/unicorn.rb` same as https://github.com/gitlabhq/gitlabhq/blob/6-2-stable/config/unicorn.rb.example but with your settings.
* Copy rack attack middleware config
```bash
sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
```
* Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
* Set up logrotate
```bash
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
```