# Conflicts:
#	app/views/projects/settings/repository/show.html.haml
#	config/routes/project.rb
#	doc/user/project/index.md

[ci skip]

Create Project Deploy Tokens to allow permanent access to repo and registry

Closes #31591

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

CE upstream - 2018-04-06 23:39 UTC

See merge request gitlab-org/gitlab-ee!5285

Geo: Mark missing primary files as synced, and add logging and metrics for sysadmins to investigate missing files

Closes #5144 and #5312

See merge request gitlab-org/gitlab-ee!5050

Bump `parser` gem to 2.5.0.5

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

The TIMESTAMP data type is used for values that contain both date and
time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to
'2038-01-19 03:14:07' UTC.

A Forever lib class was included to handle future dates for PostgreSQL
and MySQL, also changes were made to DeployToken to enforce Forever.date

Also removes extra conditional from JwtController

- Adds a default on expires_at datetime
- Modifies deploy tokens views to handle default expires at value
- Use datetime_with_timezone where possible
- Remove unused scopes

Also, fixes broken specs

We use controller actions to pass a newly created token and errors

Also:
- Changes scopes from serializer to use boolean columns
- Fixes broken specs

- Remove extra method for authorize_admin_project
- Ensure project presence
- Rename 'read_repo' to 'read_repository' to be more verbose

- When using 'read_repo' password and project are sent, so we used both
  of them to fetch for the token
- When using 'read_registry' only the password is sent, so we only use
  that for fetching the token

Also fixes spec failures on presenter and docs

- Keep 'Deploy Section' open upon save, otherwise the token might get
  lost
- When an error appears, display the error inside the form and also keep
  the Deploy Section open
- Changue copy of revoke modal

This will allow to download a repo using the token from the DeployToken

Includes:
- Model, factories, create service and controller actions
- As usual, includes specs for everything
- Builds UI (copy from PAT)
- Add revoke action

Closes #31591

1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5.
2. Fix broken CI pipelines for rails5 branches.

The 2.5.0.4 version is removed from rubygems, so it's skipped.
https://github.com/whitequark/parser/issues/478

Fix Prometheus dashboard sorting

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

Use JobFinders to get batches of job arguments.