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

Dmitriy Zaporozhets
2 parents 6683897a 5093cb02
Showing 2 changed files with 3 additions and 1 deletions Show diff stats
app/views/profiles/accounts/show.html.haml
doc/update/6.1-to-6.2.md
@@ -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'
           &nbsp;
@@ -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
 ```
	@@ -45,7 +45,7 @@		@@ -45,7 +45,7 @@
45	Username	45	Username
46	= form_for @user, url: update_username_profile_path, method: :put, remote: true do \|f\|	46	= form_for @user, url: update_username_profile_path, method: :put, remote: true do \|f\|
47	%p	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	%div	49	%div
50	= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'	50	= f.text_field :username, required: true, class: 'input-xlarge input-xpadding'
51		51