delta/gitlab/gitlab-ce.git/spec/lib, branch docs-processes

Merge branch 'backport-5986-license-templates' into 'master'

2018-08-15T16:47:34+00:00

Core backports from the Premium license templates feature

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

Fix bugs in Gitlab::Template::Finders preventing instances from BaseTemplate.all from loading content

2018-08-14T21:28:46+00:00

Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860

2018-08-14T16:21:48+00:00

Merge branch '48967-disable-statement-timeout' into 'master'

2018-08-14T08:56:28+00:00

`disable_statement_timeout` will no longer leak to other migrations

Closes #48967

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

Get the `merge-base` of 2 refs trough the API

2018-08-13T09:58:54+00:00

This adds an endpoint to get the common ancestor of 2 refs from the API.

disable_statement_timeout doesn't require any argument anymore

2018-08-11T02:15:59+00:00

it will decide the method for disable statement_timeout upon
per transaction or per session, based on how it's called.

When calling with a block, block will be executed and it will use
session based statement_timeout, otherwise will default to existing
behavior.

Fix migration_helpers_spec

2018-08-10T18:40:00+00:00

MigrationHelper `disable_statement_timeout` accepts `transaction: false`

2018-08-10T18:40:00+00:00

By default statement_timeout will only be enabled during transaction
lifetime, therefore not leaking outside of it.

With `transaction: false` it will set for entire session, but requires
a block to passed. It yields control and cleans up session after block
finishes, also preventing leaking outside of it.

Add frozen_string_literal to recently-added files from the community

2018-08-10T11:41:01+00:00

Merge branch '28930-add-project-reference-filter' into 'master'

2018-08-10T11:37:45+00:00

Resolve "GFM : provide 'project' reference in comment"

Closes #28930

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