Corrects the update document to match the version of gitshell specified in the install document (1.7.1)
Merge pull request #5109 from spudstud/6-1-stable

Corrects the update document to match the version of gitshell specified ...
Fix API::MergeRequest

Refs #5145
Merge pull request #5149 from hiroponz/fix-api-merge-request

Fix API::MergeRequest in 6-1-stable
Update check script

* GitLab Shell 1.7.1 is required
* Global projects are not supported (refs #5152)
Merge pull request #5163 from hiroponz/update-check-script-in-stable-branch

Update check script in stable branch
Simple PivotalTracker Source Commits Service
Remove not needed attr_accessible
Added spinach Tests for pivotaltracker service
Syntax cleanup
Merge pull request #5174 from johannesbecker/service-pivotaltracker

PivotalTracker Source Commits Endpoint
Update gitlab
Merge pull request #5242 from earlonrails/patch-2

Update app version in init script
Remove instructions about setting vim as the default editor

The default editor of Debian/Ubuntu is nano because it's easy to use for beginners. If a user proficient in vim reads this guide he will either have set vim as his default editor or understand to change editor to vim.

Even if the vim user doesn't understand to make these changes nano is easy to use and will be of no issue to him. Vim on the other hand will confuse the user who accidentally follows the instructions which are entirely unrelated to an already long set of installation instructions and sets vim as editor.
Merge branch 'patch-2' of github.com:Rovanion/gitlabhq