# Conflicts:
#   config/initializers/lograge.rb

Fix lograge exclusion in params section

See merge request !13146

Display specific error message when JIRA test fails

Closes #32483

See merge request !13100

Merge branch '35667-indicate-type-of-metric-for-prometheus-web-application-monitoring' into 'master'

Indicate type of metric for Prometheus web application monitoring

Closes #35667

See merge request !13142

Fix Prometheus docs to indicate Kubernetes is not required - docs

Closes #35657

See merge request !13140

This makes the logs a bit more useful to search requests by users.

Without this fix, we would just see redundant entries in the `params` section:

```
{"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":404,"duration":1.42,"view":0.38,"db":0.0,"time":"2017-07-28T02:59:18.167Z","params":{"controller":"metrics","action":"index"}}
```

The intended format looks more like this:

```
{"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":404,"duration":76.32,"view":69.95,"db":0.0,"time":"2017-07-28T02:59:48.893Z","params":{}}
```

The proper form to exclude an array is to preface with an asterisk:
https://apidock.com/rails/Hash/except

Add all ApplicationSettings attributes to the API

See merge request !12851

Incorporate RefsService.FindAllBranches Gitaly RPC

Closes gitaly#408

See merge request !13027

Remove unused haml file

See merge request !13090

Update server terminolgy to differentiate HA setups from Geo

See merge request !13139

Migrate Repository#tags to Gitaly

Closes gitaly#411

See merge request !13092

Prevent concurrent editing wiki

Closes #1827

See merge request !9707

Docs new topic: "user/profile/index"

See merge request !12611

Docs new topic "user/project/repository/index.md"

Closes #27653 and #28665

See merge request !12598

Removed `Repository#blob_by_oid` unused method

See merge request !13111

Closes gitaly#411

Skip OAuth authorization for trusted applications

See merge request !13061

Remove GitLab custom failure app for Devise

See merge request !13136

Document that instance types must match when restoring a backup

See merge request !12639

Fix prometheus client pid reuse bug

See merge request !13130

Resolve "Fix Image Blob Display due to lazy Image Loading"

Closes #35577

See merge request !13104

GPG signed commits

Closes #20268

See merge request !9546

Remove superfluous tags in RSpec examples.

Closes #34319

See merge request !12754

Ensure test files are deleted after fs metrics gathering run

Closes #35457

See merge request !13080

remove extra space

See merge request !13114

Fix the `/projects/:id/repository/branches endpoint` to handle dots in the branch name when the project full patch contains a `/`

See merge request !13115

Support custom directory in gitlab:backup:create task

See merge request !12984