delta/gitlab/gitlab-ce.git/lib, branch docs/migrate_from_github_to_gitlab

API issues - minor cleanup of permission check

2019-06-11T23:12:21+00:00

Adds `set_issue_updated_at` similar to `set_issue_created_at`
permission and cleans up the related permission check in issues
API.

Revert "Automatically update MR merge-ref along merge status"

2019-06-11T16:08:25+00:00

Merge branch 'ignore-artifact-attirbutes-in-project-import-export' into 'master'

2019-06-11T12:54:21+00:00

Ignore legacy artifact columns in Project Import/Export

Closes #63033

See merge request gitlab-org/gitlab-ce!29427

Ignore legacy artifact columns in Project Import/Export

2019-06-11T11:39:29+00:00

Ignore some columns

Merge branch 'prom-api-1' into 'master'

2019-06-11T11:26:01+00:00

Update server API to enable switch prometheus endpoint

See merge request gitlab-org/gitlab-ce!29186

Merge branch 'add-lfs-blob-ids-to-tree-type' into 'master'

2019-06-11T10:02:13+00:00

Add LFS blob IDs to GraphQL tree type

See merge request gitlab-org/gitlab-ce!28666

Merge branch 'sh-fix-utf-8-encoding-resolve-conflicts' into 'master'

2019-06-11T07:25:01+00:00

Fix UTF-8 conversion issues when resolving conflicts

Closes #63062

See merge request gitlab-org/gitlab-ce!29453

Force source and target branch to binary mode

2019-06-11T03:50:00+00:00

Merge branch 'allow-emoji-in-references' into 'master'

2019-06-10T23:34:17+00:00

Allow references to labels and milestones to contain emoji

Closes #37762, #53756, and #40728

See merge request gitlab-org/gitlab-ce!29284

Fix UTF-8 conversion issues when resolving conflicts

2019-06-10T22:54:14+00:00

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/63030,
when the commit message in the /resolve_conflicts endpoint contains a
UTF-8 character, the conversion to the Gitaly ASCII-8BIT value may flag
an error. To fix this, we run `force_encoding` on the commit message.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63062