Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
+v 8.0.1
+  - Improve CI migration procedure and documentation
+
 v 8.0.0
   - Fix Markdown links not showing up in dashboard activity feed (Stan Hu)
   - Remove milestones from merge requests when milestones are deleted (Stan Hu)

app/views/admin/users/index.html.haml

@@ -97,5 +97,5 @@
                 - if user.access_locked?
                   = link_to 'Unlock', unlock_admin_user_path(user), method: :put, class: "btn btn-xs btn-success", data: { confirm: 'Are you sure?' }
                 - if user.can_be_removed?
-                  = link_to 'Destroy', [:admin, user], data: { 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-xs btn-remove"
+                  = link_to 'Destroy', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Maybe block the user instead? Are you sure?" }, method: :delete, class: "btn btn-xs btn-remove"
     = paginate @users, theme: "gitlab"

doc/migrate_ci_to_ce/README.md

@@ -179,8 +179,8 @@ will need this file later.
 sudo gitlab-ci-rake backup:create
 # Source
-cd /home/git/gitlab
-sudo -u git -H bundle exec rake backup:create RAILS_ENV=production
+cd /home/gitlab_ci/gitlab-ci
+sudo -u gitlab_ci -H bundle exec rake backup:create RAILS_ENV=production
 ```
 #### 3. Copy data to the GitLab server

doc/update/upgrader.md

-# GitLab Upgrader
+# GitLab Upgrader (deprecated)
 *DEPRECATED* We recommend to [switch to the Omnibus package and repository server](https://about.gitlab.com/update/) instead of using this script.

lib/tasks/gitlab/check.rake

@@ -679,6 +679,11 @@ namespace :gitlab do
     def check_initd_configured_correctly
       print "Init.d configured correctly? ... "
+      if omnibus_gitlab?
+        puts 'skipped (omnibus-gitlab has no init script)'.magenta
+        return
+      end
+
       path = "/etc/default/gitlab"
       if File.exist?(path) && File.read(path).include?("mail_room_enabled=true")