Merge pull request #6321 from robertd/update_upgrader_guide

Update upgrader.md ... safety first
Fixed bug with json files content being escaped in api

After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Complete api files CRUD

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Extract commits API to separate file

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 Merge branch 'bug/blob_escaped_json' into 'master'

Fixed bug with json files content being escaped in api

Fixes #1035
Dont replace all issue context when change assignee/milestone

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Filter issues by multiple labels with Spinach feature spec
 Merge branch 'feature/api_fle_encoded' into 'master'

Complete api files CRUD

Adds ability to read file from repository with content encoded with Base64.
Fix tests
Split merge request coffee

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Allow change assignee/milestone from MergeRequest show page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 Merge branch 'feature/mr_context' into 'master'

Allow change assignee/milestone from MergeRequest show page
Doesn't exist for user endpoint.
Use same avatar size for all event rows

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 Merge branch 'namespace-api-doc' into 'master'

Namespace Api Doc
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Fix random failing test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 Merge branch 'request/branch_compare' into 'master'

Fix for compare button within branches dialog

For the button Compare within the Branches screen ( https://gitlab.com/gitlab-org/gitlab-ce/branches ) beside a branch "foo"

Old behavior:
Will redirect to the compare page that is defaulted to comparison for branch "foo" <--> "foo"

New behavior:
Will redirect and trigger compare page of branch "default" <--> "foo"
Remove of button beside default branch
Add close button to MR comment form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce