delta/gitlab/gitlab-ce.git/spec, branch commit-side-by-side-comment

Fixes commit comments in side-by-side diff view

2017-09-27T14:38:13+00:00

This was caused by the `notes` global class not existing when the
`file_comment_button` code is run. The notes class was used to check
if the diff is currently in parallel view or not. To get around this
I've added a check into the `file_comment_button` JS to check if the
view is currently parallel or not.

Closes #38117

Merge branch '38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci' into 'master'

2017-09-27T12:01:42+00:00

Fix component update with branch specifiers on CI

Closes #38378

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

Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master'

2017-09-27T11:29:57+00:00

find_user users helper method no longer overrides find_user API helper method.

Closes #37467

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

Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master'

2017-09-27T09:34:53+00:00

Stop breadcrumbs changing container when in side-by-side diff

Closes #37641

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

find_user users helper method no longer overrides find_user API helper method.

2017-09-26T18:14:19+00:00

Add a spec for Github::Client and revert an `if !` to `unless`

2017-09-26T17:17:00+00:00

Signed-off-by: Rémy Coutable

Merge branch 'dm-simple-project-avatar-url' into 'master'

2017-09-26T14:28:38+00:00

Expose avatar_url when requesting list of projects from API with simple=true

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

Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'

2017-09-26T14:16:46+00:00

Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors

Closes #38100

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

Merge branch 'expose-last-pipeline-for-a-commit' into 'master'

2017-09-26T14:14:07+00:00

Expose last pipeline details in API response when getting a single commit

Closes #35692

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

Merge branch 'changes-bar-dynamic-placeholder' into 'master'

2017-09-26T11:09:42+00:00

Dynamically create offset for sticky bar

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