Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-22

# Conflicts:
#	doc/ci/examples/dast.md

[ci skip]

doc/ci/examples/dast.md

@@ -35,6 +35,10 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi
 be automatically extracted and shown right in the merge request widget. To do
 so, the CI job must be named `dast` and the artifact path must be
 `gl-dast-report.json`.
+<<<<<<< HEAD
 [Learn more about DAST results shown in merge requests](../../user/project/merge_requests/dast.md).
+=======
+[Learn more about DAST results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html).
+>>>>>>> upstream/master
 
 [ee]: https://about.gitlab.com/gitlab-ee/

lib/tasks/gitlab/check.rake

@@ -430,7 +430,7 @@ namespace :gitlab do
   namespace :user do
     desc "GitLab | Check the integrity of a specific user's repositories"
     task :check_repos, [:username] => :environment do |t, args|
-      username = args[:username] || prompt("Check repository integrity for fsername? ".color(:blue))
+      username = args[:username] || prompt("Check repository integrity for username? ".color(:blue))
       user = User.find_by(username: username)
       if user
         repo_dirs = user.authorized_projects.map do |p|