Commit de46a5b6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents 6683897a 5093cb02
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
Username Username
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f| = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
%p %p
Changing your username will change path to all personl projects! Changing your username will change path to all personal projects!
%div %div
= f.text_field :username, required: true, class: 'input-xlarge input-xpadding' = f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
   
......
...@@ -60,11 +60,13 @@ git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.examp ...@@ -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/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. * 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 * Copy rack attack middleware config
```bash ```bash
sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb 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` * Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
* Set up logrotate * Set up logrotate
```bash ```bash
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment