Add an example.
Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq
Add smtp settings override in smtp_settings sample file.
Skip rdoc to speed up Ruby compilation
Show milestones iid instead of id
A few other iids instead of ids (mostly in edit forms)
Cover the simple_sanitize helper
Refactor and cover search_autocomplete_source
Merge pull request #5377 from tsigo/autocomplete_refactor

Refactor search_autocomplete_source
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Merge pull request #5373 from rtripault/milestone-iid

Show milestones iid instead of id
Fix rspec test after bdd3513f03a1db060051a29ffcf535821235eac1
corrected the url of the init-script
Use init.d/gitlab script from 6-0-stable branch

Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine.

It says:
```
Starting the GitLab Unicorn web server...
/etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found
Starting the GitLab Sidekiq event dispatcher...
/etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found
GitLab is not running.
```
Merge pull request #5382 from nattster/patch-1

Use init.d/gitlab script from 6-0-stable branch
Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq
Improve project_merge_requests.rb feature steps
Version up to 6.2.0
Merge pull request #5380 from thestv/patch-1

corrected the url of the init-script
Merge branch 'master' of github.com:gitlabhq/gitlabhq