delta/gitlab/gitlab-ce.git/spec, branch backport-border-inline-edit

Backport border inline edit

2017-11-28T19:14:46+00:00

Merge branch '40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master'

2017-11-28T18:01:09+00:00

Resolve "Merge request generates wrong diff when branch and tag have the same name"

Closes #40530

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

Ensure MRs always use branch refs for comparison

2017-11-28T17:01:38+00:00

If a merge request was created with a branch name that also matched a tag name,
we'd generate a comparison to or from the tag respectively, rather than the
branch. Merging would still use the branch, of course.

To avoid this, ensure that when we get the branch heads, we prepend the
reference prefix for branches, which will ensure that we generate the correct
comparison.

Merge branch 'hashed-storage-attachments-migration-path' into 'master'

2017-11-28T12:46:39+00:00

Hashed storage attachments migration path

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

Merge branch '40561-environment-scope-value-is-not-trimmed' into 'master'

2017-11-28T12:22:40+00:00

Strip leading & trailing whitespaces in CI/CD secret variable keys

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

Merge branch 'tm/feature/list-runners-jobs-api' into 'master'

2017-11-28T10:48:24+00:00

Add new API endpoint - list jobs of a specified runner

Closes #39699

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

Changes to Attachments Migration for EE and Geo compatibility

2017-11-28T10:22:23+00:00

Merge branch 'icon-sizes' into 'master'

2017-11-28T09:42:24+00:00

limit icon component size to valid values

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

Merge branch 'tm/feature/namespace-by-id-api' into 'master'

2017-11-28T08:57:39+00:00

Add new API endpoint - get a namespace by ID

Closes #40254

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

Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into 'master'

2017-11-28T08:25:18+00:00

Refactor the way we pass `old associations` to issuable's update services

Closes #40226

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