diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-22 15:06:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-22 15:06:27 +0300 |
| commit | 9ce26d3dfdf4194f32c470cd3102b4376a53ef2f (patch) | |
| tree | cedbe994764a8eb4f95448605b1372cd5f759b0b | |
| parent | f610aa7c6d6e98e72f630b7e9170fd060ed963f8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/models/clusters/applications/runner.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-dupe-approvals-failing.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-9-0.yml | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb index 2d6af8f4f0b..954046c143b 100644 --- a/app/models/clusters/applications/runner.rb +++ b/app/models/clusters/applications/runner.rb @@ -3,7 +3,7 @@ module Clusters module Applications class Runner < ApplicationRecord - VERSION = '0.8.0' + VERSION = '0.9.0' self.table_name = 'clusters_applications_runners' diff --git a/changelogs/unreleased/sh-fix-dupe-approvals-failing.yml b/changelogs/unreleased/sh-fix-dupe-approvals-failing.yml new file mode 100644 index 00000000000..c3115c5b6da --- /dev/null +++ b/changelogs/unreleased/sh-fix-dupe-approvals-failing.yml @@ -0,0 +1,5 @@ +--- +title: Fix error when duplicate users are merged in approvers list +merge_request: 17406 +author: +type: fixed diff --git a/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-9-0.yml b/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-9-0.yml new file mode 100644 index 00000000000..b7709b10402 --- /dev/null +++ b/changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-9-0.yml @@ -0,0 +1,5 @@ +--- +title: Update GitLab Runner Helm Chart to 0.9.0 +merge_request: 17326 +author: +type: other |