From 3db309760d22ef7c7d783f5c09b91fc8ff7cd482 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 29 2019 09:11:00 +0000
Subject: Update files in master for the 5.4 version


Basically this makes sure the changes made for 5.4, the changelog
the upgrading doc, the spec file and the versions are also present
in the master branch and the future releases.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/UPGRADING.rst b/UPGRADING.rst
index 379431c..5d51b0e 100644
--- a/UPGRADING.rst
+++ b/UPGRADING.rst
@@ -1,6 +1,13 @@
 Upgrading Pagure
 ================
 
+From 5.3.x to 5.4
+-----------------
+
+The 5.4 release does not contain any database schema changes, nor any new
+configuration key.
+
+
 From 5.2 to 5.3
 ---------------
 
@@ -62,6 +69,10 @@ New configuration keys have been added:
 One configuration key changes its default structure:
 * TRIGGER_CI
 
+Changes in dependencies:
+* Mimimal version of pygit2 version bumped to: 0.26.0
+* Minimal version of openssh set to: 7.4
+
 
 From 5.1 to 5.1.4
 -----------------
@@ -176,6 +187,9 @@ Note: Some configuration keys changed their default value:
 * FEDMSG_NOTIFICATIONS
 * PAGURE_AUTH
 
+New dependencies:
+* trololio (replaces trollius that is no longer a direct dependency)
+
 
 From 3.x to 4.0
 ---------------
diff --git a/doc/changelog.rst b/doc/changelog.rst
index d15ec4b..6f6bfb8 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -3,6 +3,34 @@ Changelog
 
 This document records all notable changes to `Pagure <https://pagure.io>`_.
 
+5.4 (2019-03-28)
+----------------
+
+- Allow by default the ACL "pull_request_create" on project-less API token
+  (Lenka Segura)
+- Implement Pagure Git Auth (Patrick Uiterwijk)
+- Add a upper limit to sqlalchemy as 1.3.0 breaks our tests
+- Add a new API endpoint allowing to update an existing PR
+- If the user doesn't have a valid ssh key inform but let them log in
+- Fix displaying diffs that contain symlinks (Slavek Kabrda)
+- Add missing namespace on the link to see the user's issues when they become
+  assignee of a ticket
+- Add a button to take/drop a pull-request (assignee field)
+- Add a new API endpoint to assign pull-request to someone
+- Fix the link to view all the user's projects on the dashboard
+- Allow dots and plus signs in project names
+- When loading blocking or depending tickets restricts the list of tickets based
+  on the user's input
+- Fix seeing releases when the reference prodived returned a commit
+- Allow div element to have id tags
+- Include the PR tags in their JSON representation
+- Inform the user when changing the assignee failed because of an ajax error
+- Ensure the comment & close button shows up for the author
+- Deprecate fedmsg
+- Stream the repoSpanner proxy responses (Patrick Uiterwijk)
+- Ensure that forking does not run the hook (Patrick Uiterwijk)
+
+
 5.3 (2019-02-22)
 ----------------
 
diff --git a/files/pagure.spec b/files/pagure.spec
index 106820d..d726bca 100644
--- a/files/pagure.spec
+++ b/files/pagure.spec
@@ -16,7 +16,7 @@
 
 
 Name:               pagure
-Version:            5.3
+Version:            5.4
 Release:            1%{?dist}
 Summary:            A git-centered forge
 
@@ -491,6 +491,9 @@ done
 
 
 %changelog
+* Thu Mar 28 2019 Pierre-Yves Chibon <pingou@pingoured.fr> - 5.4-1
+- Update to pagure 5.4
+
 * Fri Feb 22 2019 Pierre-Yves Chibon <pingou@pingoured.fr> - 5.3-1
 - Update to pagure 5.3
 
diff --git a/pagure/__init__.py b/pagure/__init__.py
index 36e7d2e..b54480b 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -11,5 +11,5 @@
 from __future__ import unicode_literals, absolute_import
 
 
-__version__ = "5.3"
-__api_version__ = "0.26"
+__version__ = "5.4"
+__api_version__ = "0.27"