From d06031c4279e8bf9b870f888f948b78aef62f543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Thu, 20 May 2021 13:45:24 +0200
Subject: [PATCH 1/2] Don't run release 1.3.0 tasks anymore

People who have already upgraded to version 1.3.0 don't need to execute
them again.

We're not deleting the tasks yet in case some people would like to
upgrade from version 1.2.0 to version 1.3.1. In this case, they'll have
to execute the tasks manually.
---
 lib/tasks/consul.rake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/tasks/consul.rake b/lib/tasks/consul.rake
index 49ffa920c..0cf100930 100644
--- a/lib/tasks/consul.rake
+++ b/lib/tasks/consul.rake
@@ -1,8 +1,7 @@
 namespace :consul do
   desc "Runs tasks needed to upgrade to the latest version"
   task execute_release_tasks: ["settings:rename_setting_keys",
-                               "settings:add_new_settings",
-                               "execute_release_1.3.0_tasks"]
+                               "settings:add_new_settings"]
 
   desc "Runs tasks needed to upgrade from 1.2.0 to 1.3.0"
   task "execute_release_1.3.0_tasks": [

From 4d314b08d3d7b97c5b712d561b42b057a2811d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Tue, 1 Jun 2021 01:22:15 +0200
Subject: [PATCH 2/2] Release version 1.3.1

---
 CHANGELOG.md                               | 26 ++++++++++++++++++++++
 Rakefile                                   |  4 ++--
 app/controllers/installation_controller.rb |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a51b65f8e..18879672f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,32 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [1.3.1](https://github.com/consul/consul/tree/1.3.1) (2021-06-03)
+
+[Full Changelog](https://github.com/consul/consul/compare/1.3.0...1.3.1)
+
+### Added
+
+- **Translations:** Update translations from Crowdin [\#4537](https://github.com/consul/consul/pull/4537)
+
+### Changed
+
+- **Maintenance-Deployment:** Upgrade Ruby to version 2.6.7 [\#4524](https://github.com/consul/consul/pull/4524) and [\#4535](https://github.com/consul/consul/pull/4535)
+- **Maintenance-Gems:** Bump nokogiri from 1.11.2 to 1.11.6 [\#4529](https://github.com/consul/consul/pull/4529)
+- **Maintenance-Gems:** Bump rails from 5.2.4.5 to 5.2.4.6 [\#4525](https://github.com/consul/consul/pull/4525)
+- **Maintenance-Gems:** Bump puma from 4.3.6 to 4.3.8 [\#4519](https://github.com/consul/consul/pull/4519)
+- **Maintenance-Gems:** Bump rexml from 3.2.4 to 3.2.5 [\#4500](https://github.com/consul/consul/pull/4500)
+
+### Fixed
+
+- **Accessibility:** Increase menu button touch area on small screens [\#4503](https://github.com/consul/consul/pull/4503)
+- **Admin:** Fix crash destroying budget with administrators [\#4528](https://github.com/consul/consul/pull/4528)
+- **Admin:** Fix crash with budgets with disabled current phase [\#4522](https://github.com/consul/consul/pull/4522)
+- **Legislation:** Validate process dates depending on enabled phases [\#4521](https://github.com/consul/consul/pull/4521)
+- **Maintenance:** Fix order loading custom styles [\#4515](https://github.com/consul/consul/pull/4515)
+- **Maintenance-Specs:** Fix header card factory [\#4512](https://github.com/consul/consul/pull/4512)
+- **Translations:** Fix exception using locales with no help images [\#4518](https://github.com/consul/consul/pull/4518)
+
 ## [1.3.0](https://github.com/consul/consul/tree/1.3.0) (2021-04-27)
 
 [Full Changelog](https://github.com/consul/consul/compare/1.2.0...1.3.0)
diff --git a/Rakefile b/Rakefile
index 3ec2bb893..a5bb872b7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,8 +11,8 @@ if Rails.env.development?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.user = "consul"
     config.project = "consul"
-    config.since_tag = "1.2.0"
-    config.future_release = "1.3.0"
+    config.since_tag = "1.3.0"
+    config.future_release = "1.3.1"
     config.base = "#{Rails.root}/CHANGELOG.md"
     config.token = Rails.application.secrets.github_changelog_token
     config.issues = false
diff --git a/app/controllers/installation_controller.rb b/app/controllers/installation_controller.rb
index 56db7976b..6b7ac631d 100644
--- a/app/controllers/installation_controller.rb
+++ b/app/controllers/installation_controller.rb
@@ -11,7 +11,7 @@ class InstallationController < ApplicationController
 
     def consul_installation_details
       {
-        release: "1.3.0"
+        release: "1.3.1"
       }.merge(features: settings_feature_flags)
     end