Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-03-07 12:00:39 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-03-07 12:00:39 +0300
commita0dc989efce5515029663dc31041f57475bdc6a1 (patch)
treee0972287bbf4668950e84edc07abb70bc866863c
parent1a080473f5ffd6c55bf9bd07b6f977ceba90fbe7 (diff)
Version 1.25.0v1.25.0
-rw-r--r--CHANGELOG.md25
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/ci-drop-ruby-2-4.yml5
-rw-r--r--changelogs/unreleased/jc-add-find-all-tags-feature-flag.yml5
-rw-r--r--changelogs/unreleased/remote-go.yml5
-rw-r--r--changelogs/unreleased/switch-to-embedded-hooks.yml5
-rw-r--r--changelogs/unreleased/zj-praefect-prometheus.yml5
-rw-r--r--changelogs/unreleased/zj-start-without-config.yml5
8 files changed, 26 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1448743f..c966293f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
# Gitaly changelog
+## v1.25.0
+
+#### Added
+- Add prometheus listener to Praefect
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1108
+
+#### Changed
+- Stop using gitlab-shell hooks -- but keep using gitlab-shell config
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1088
+
+#### Fixed
+- Fix undefined logger panicing
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1114
+
+#### Other
+- Stop running tests on Ruby 2.4
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1113
+- Add feature flag for FindAllTags
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1106
+
+#### Performance
+- Rewrite remove remote in go
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1051
+ Contributed by maxmati
+
## v1.24.0
#### Added
diff --git a/VERSION b/VERSION
index 53cc1a6f9..ad2191947 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.24.0
+1.25.0
diff --git a/changelogs/unreleased/ci-drop-ruby-2-4.yml b/changelogs/unreleased/ci-drop-ruby-2-4.yml
deleted file mode 100644
index 92fab1da1..000000000
--- a/changelogs/unreleased/ci-drop-ruby-2-4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop running tests on Ruby 2.4
-merge_request: 1113
-author:
-type: other
diff --git a/changelogs/unreleased/jc-add-find-all-tags-feature-flag.yml b/changelogs/unreleased/jc-add-find-all-tags-feature-flag.yml
deleted file mode 100644
index f9298b43b..000000000
--- a/changelogs/unreleased/jc-add-find-all-tags-feature-flag.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add feature flag for FindAllTags
-merge_request: 1106
-author:
-type: other
diff --git a/changelogs/unreleased/remote-go.yml b/changelogs/unreleased/remote-go.yml
deleted file mode 100644
index 7bd81dd98..000000000
--- a/changelogs/unreleased/remote-go.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rewrite remove remote in go
-merge_request: 1051
-author: maxmati
-type: performance
diff --git a/changelogs/unreleased/switch-to-embedded-hooks.yml b/changelogs/unreleased/switch-to-embedded-hooks.yml
deleted file mode 100644
index 1637d6b29..000000000
--- a/changelogs/unreleased/switch-to-embedded-hooks.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop using gitlab-shell hooks -- but keep using gitlab-shell config
-merge_request: 1088
-author:
-type: changed
diff --git a/changelogs/unreleased/zj-praefect-prometheus.yml b/changelogs/unreleased/zj-praefect-prometheus.yml
deleted file mode 100644
index dbc02885b..000000000
--- a/changelogs/unreleased/zj-praefect-prometheus.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add prometheus listener to Praefect
-merge_request: 1108
-author:
-type: added
diff --git a/changelogs/unreleased/zj-start-without-config.yml b/changelogs/unreleased/zj-start-without-config.yml
deleted file mode 100644
index 4df37ca0a..000000000
--- a/changelogs/unreleased/zj-start-without-config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix undefined logger panicing
-merge_request: 1114
-author:
-type: fixed