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

Dmitriy Zaporozhets
2 parents 6a90378d 27900efb
Showing 4 changed files with 10 additions and 11 deletions Show diff stats
app/views/admin/users/index.html.haml
doc/install/installation.md
doc/update/6.2-to-6.3.md
lib/gitlab/oauth/user.rb
@@ -54,5 +54,5 @@
                   = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
                 - else
                   = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
-                = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove"
+                = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! All tickets linked to this user will also be removed! Maybe block the user instead? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
     = paginate @users, theme: "gitlab"
@@ -144,13 +144,10 @@ GitLab Shell is an ssh access and repository management software developed speci
     cd /home/git
     # Clone gitlab shell
-    sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git
+    sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git -b v1.7.9
     cd gitlab-shell
-    # switch to right version
-    sudo -u git -H git checkout v1.7.9
-
     sudo -u git -H cp config.yml.example config.yml
     # Edit config and replace gitlab_url
@@ -174,14 +171,11 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
 ## Clone the Source
     # Clone GitLab repository
-    sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git gitlab
+    sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git -b 6-3-stable gitlab
     # Go to gitlab dir
     cd /home/git/gitlab
-    # Checkout to stable release
-    sudo -u git -H git checkout 6-3-stable
-
 **Note:**
 You can change `6-3-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
@@ -63,7 +63,12 @@ git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.examp
 * Make `/home/git/gitlab/config/gitlab.yml` same as https://github.com/gitlabhq/gitlabhq/blob/6-3-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-3-stable/config/unicorn.rb.example but with your settings.
-* Copy rack attack middleware config
+
+```bash
+# Copy rack attack middleware config
+cd /home/git/gitlab
+sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
+```
 ### 6. Update Init script
@@ -28,8 +28,8 @@ module Gitlab
           }
           user = model.build_user(opts, as: :admin)
+          user.skip_confirmation!
           user.save!
-          user.confirm!
           log.info "(OAuth) Creating user #{email} from login with extern_uid => #{uid}"
           if Gitlab.config.omniauth['block_auto_created_users'] && !ldap?
	@@ -54,5 +54,5 @@		@@ -54,5 +54,5 @@
54	= link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"	54	= link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn btn-small success"
55	- else	55	- else
56	= link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"	56	= link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove"
57	- = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-small btn-remove"	57	+ = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! All tickets linked to this user will also be removed! Maybe block the user instead? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
58	= paginate @users, theme: "gitlab"	58	= paginate @users, theme: "gitlab"