diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-21 20:18:00 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-21 20:18:00 +0000 |
| commit | 45b3f554aabf75ef5b7e0a4f7cb05a67bed05a70 (patch) | |
| tree | 2e9611b315f04f8bc2397929fc6522a7fe8ef756 | |
| parent | 95a9c6245c1ebb05b30453eaf2628ca030d7acf9 (diff) | |
| parent | bc04fad727fdecc11b5f1f14bd10b84bb969fdf3 (diff) | |
| download | gitlab-ce-45b3f554aabf75ef5b7e0a4f7cb05a67bed05a70.tar.gz | |
Merge branch 'uncomment_commit_signatures_feature_flag' into 'master'
Upgrade to gitaly 1.60.0 and uncomment get_commit_signatures feature flag
Closes #65991
See merge request gitlab-org/gitlab-ce!31981
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/uncomment_commit_signatures_feature_flag.yml | 5 | ||||
| -rw-r--r-- | lib/feature/gitaly.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index bb120e876c6..4d5fde5bd16 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -1.59.0 +1.60.0 diff --git a/changelogs/unreleased/uncomment_commit_signatures_feature_flag.yml b/changelogs/unreleased/uncomment_commit_signatures_feature_flag.yml new file mode 100644 index 00000000000..8f6c89e7dd3 --- /dev/null +++ b/changelogs/unreleased/uncomment_commit_signatures_feature_flag.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade to Gitaly 1.60.0 +merge_request: 31981 +author: +type: changed diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb index 9ded1aed4e3..edfd2fb17f3 100644 --- a/lib/feature/gitaly.rb +++ b/lib/feature/gitaly.rb @@ -7,7 +7,7 @@ class Feature # Server feature flags should use '_' to separate words. SERVER_FEATURE_FLAGS = [ - # 'get_commit_signatures'.freeze + 'get_commit_signatures'.freeze ].freeze DEFAULT_ON_FLAGS = Set.new([]).freeze |