Download as
Browse Code »

Commit de46a5b602fba9b29a1924fc35c2ad138232ad8a

Authored by Dmitriy Zaporozhets
2 parents 6683897a 5093cb02
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
app/views/profiles/accounts/show.html.haml
  Diff comments   View file @de46a5b
... ... @@ -45,7 +45,7 @@
45 45 Username
46 46 = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
47 47 %p
48   - Changing your username will change path to all personl projects!
  48 + Changing your username will change path to all personal projects!
49 49 %div
50 50 = f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
51 51  
... ...
doc/update/6.1-to-6.2.md
  Diff comments   View file @de46a5b
... ... @@ -60,11 +60,13 @@ git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.examp
60 60 * 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.
61 61 * 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.
62 62 * Copy rack attack middleware config
  63 +
63 64 ```bash
64 65 sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
65 66 ```
66 67 * Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
67 68 * Set up logrotate
  69 +
68 70 ```bash
69 71 sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
70 72 ```
... ...