set the collation to utf8_general_ci

I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci

set the collation to utf8_general_ci

I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci

set the collation to utf8_general_ci

I get problems with strange characters in merge requests unless the collation is set to utf8_general_ci
Fix not rendered the network graph edge.
Improve error reporting on users API

* users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
Factor .add-diff-note active state.
Improve the wording explaining protected branches.
Fix invalid method in test

Use FileUtils::rm_f to delete the satellite lock file.
Replace javascript:; links with buttons.
Only clone GitLab Shell on tests if necessary.
Use origin to compare so it is not dependent on checking out the branch before.
Add to monthly doc that reverting a feature is an option.
Merge branch 'monthly_doc' into 'master'

Add to monthly doc that reverting is an option

See merge request !1106
Merge pull request #7692 from mr-vinn/fix-spec-rm

Use FileUtils to delete instead of File
Fix ref parsing in Gitlab::GitAccess
Fix MR commenting system when new commits pushed

This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`
Fix 500 error on diff if file permission changed
Increase unicorn timeout to 60 seconds
Prevent 500 error on search results if description contains relative link
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'fix_git_access' into 'master'

Fix ref parsing in Gitlab::GitAccess

See merge request !1107
Merge branch 'fix-mr-commit-comment' into 'master'

Fix MR commenting system when new commits pushed

Fixes #1608

This conmmit fixes wierd behaviour when you see wrong comments about new
commits in merge requests.

Short explanation of a bug:
When you push new commits to project we updated `project.merge_requests`
with comment about push. But `project.merge_requests` includes also
merge requests from forks to origin project. So when you push to master
branch it commented on all merge requests from forks to origin where
source_branch was `master`

See merge request !1108