delta/gitlab/gitlab-ce.git/config/initializers, branch docs/api-nil

Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'

2017-11-24T09:01:12+00:00

Update Prometheus Gem version and disable Prometheus method call instrumentation by default.

Closes gitlab-ee#4139 and #40457

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

Rename wip to worker_id

2017-11-23T22:33:02+00:00

Move prometheus middle ware to prometheus initialized.

2017-11-23T22:32:55+00:00

Allow password authentication to be disabled entirely

2017-11-23T13:16:14+00:00

Merge branch 'feature_add_mermaid' into 'master'

2017-11-22T11:00:12+00:00

Add support of Mermaid

Closes #3711

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

Add support of Mermaid

2017-11-22T03:12:04+00:00

Set the default gitlab-shell timeout to 3 hours

2017-11-21T17:32:37+00:00

Batchload blobs for diff generation

2017-11-21T12:53:26+00:00

After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs
are not merged yet.

For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.

Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431

Fix offense to the LineBreakAfterGuardClauses cop

2017-11-20T11:25:07+00:00

Signed-off-by: Rémy Coutable

Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'

2017-11-20T09:22:14+00:00

Adds Rubocop rule for line break after guard clause

Closes #18040

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