summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md13
-rw-r--r--changelogs/unreleased/bvl-fix-unlinking-with-lfs-objects.yml6
-rw-r--r--changelogs/unreleased/dm-issue-move-transaction-error.yml5
-rw-r--r--changelogs/unreleased/osw-use-atomic-reference-instead-atomic-fixnum.yml4
-rw-r--r--changelogs/unreleased/pawel-reduce_cardinality_of_prometheus_metrics.yml5
-rw-r--r--changelogs/unreleased/sh-handle-anonymous-clones-project-moved.yml5
6 files changed, 13 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d1b7d926cb..e474786d09d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.3.1 (2017-12-27)
+
+### Fixed (3 changes)
+
+- Don't link LFS objects to a project when unlinking forks when they were already linked. !16006
+- Execute project hooks and services after commit when moving an issue.
+- Fix Error 500s with anonymous clones for a project that has moved.
+
+### Changed (1 change)
+
+- Reduce the number of buckets in gitlab_cache_operation_duration_seconds metric. !15881
+
+
## 10.3.0 (2017-12-22)
### Security (1 change, 1 of them is from the community)
diff --git a/changelogs/unreleased/bvl-fix-unlinking-with-lfs-objects.yml b/changelogs/unreleased/bvl-fix-unlinking-with-lfs-objects.yml
deleted file mode 100644
index 058d686e74c..00000000000
--- a/changelogs/unreleased/bvl-fix-unlinking-with-lfs-objects.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Don't link LFS objects to a project when unlinking forks when they were already
- linked
-merge_request: 16006
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-issue-move-transaction-error.yml b/changelogs/unreleased/dm-issue-move-transaction-error.yml
deleted file mode 100644
index 0892169894a..00000000000
--- a/changelogs/unreleased/dm-issue-move-transaction-error.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Execute project hooks and services after commit when moving an issue
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/osw-use-atomic-reference-instead-atomic-fixnum.yml b/changelogs/unreleased/osw-use-atomic-reference-instead-atomic-fixnum.yml
deleted file mode 100644
index b0ab3ae8b2b..00000000000
--- a/changelogs/unreleased/osw-use-atomic-reference-instead-atomic-fixnum.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Adjust failure when starting GitLab instance on x86 systems
-merge_request:
-author: Mike Limansky
diff --git a/changelogs/unreleased/pawel-reduce_cardinality_of_prometheus_metrics.yml b/changelogs/unreleased/pawel-reduce_cardinality_of_prometheus_metrics.yml
deleted file mode 100644
index 0cee0b634d6..00000000000
--- a/changelogs/unreleased/pawel-reduce_cardinality_of_prometheus_metrics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reduce the number of buckets in gitlab_cache_operation_duration_seconds metric
-merge_request: 15881
-author:
-type: changed
diff --git a/changelogs/unreleased/sh-handle-anonymous-clones-project-moved.yml b/changelogs/unreleased/sh-handle-anonymous-clones-project-moved.yml
deleted file mode 100644
index a0860871152..00000000000
--- a/changelogs/unreleased/sh-handle-anonymous-clones-project-moved.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Error 500s with anonymous clones for a project that has moved
-merge_request:
-author:
-type: fixed