# Conflicts:
#	app/views/layouts/nav/sidebar/_project.html.haml
#	app/views/projects/_home_panel.html.haml

[ci skip]

Add user documentation for badges

Closes #41174 and #41176

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

Projects and groups badges settings UI (EE-port)

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

Projects and groups badges settings UI

Closes #41174 and #41176

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

CE upstream - 2018-04-07 09:18 UTC

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

Branch Unprotection Restrictions using group/user access levels

Closes #4800

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

# 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