Add latest changes from gitlab-org/gitlab@master

4 files changed, 13 insertions, 12 deletions

diff --git a/lib/api/releases.rb b/lib/api/releases.rb
index 048cbf3ad83..c69f45f1f38 100644
--- a/lib/api/releases.rb
+++ b/lib/api/releases.rb
@@ -30,8 +30,6 @@ module API
         use :pagination
       end
       get ":id/releases" do
-        not_found! unless Feature.enabled?(:group_releases_finder_inoperator)
-
         finder_options = {
           sort: params[:sort]
         }
diff --git a/lib/gitlab/hook_data/issuable_builder.rb b/lib/gitlab/data_builder/issuable.rb
index add9e880475..9a0b964915c 100644
--- a/lib/gitlab/hook_data/issuable_builder.rb
+++ b/lib/gitlab/data_builder/issuable.rb
@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 module Gitlab
-  module HookData
-    class IssuableBuilder < BaseBuilder
+  module DataBuilder
+    class Issuable
       CHANGES_KEYS = %i[previous current].freeze
 
-      alias_method :issuable, :object
+      attr_reader :issuable
+
+      def initialize(issuable)
+        @issuable = issuable
+      end
 
       def build(user: nil, changes: {})
         hook_data = {
diff --git a/lib/gitlab/i18n.rb b/lib/gitlab/i18n.rb
index 8b775d567c8..c8239c9e308 100644
--- a/lib/gitlab/i18n.rb
+++ b/lib/gitlab/i18n.rb
@@ -43,7 +43,7 @@ module Gitlab
     TRANSLATION_LEVELS = {
       'bg' => 0,
       'cs_CZ' => 0,
-      'da_DK' => 44,
+      'da_DK' => 43,
       'de' => 14,
       'en' => 100,
       'eo' => 0,
@@ -53,17 +53,17 @@ module Gitlab
       'gl_ES' => 0,
       'id_ID' => 0,
       'it' => 1,
-      'ja' => 34,
+      'ja' => 33,
       'ko' => 12,
       'nb_NO' => 29,
       'nl_NL' => 0,
       'pl_PL' => 4,
       'pt_BR' => 50,
-      'ro_RO' => 36,
-      'ru' => 31,
+      'ro_RO' => 58,
+      'ru' => 30,
       'tr_TR' => 13,
-      'uk' => 46,
-      'zh_CN' => 97,
+      'uk' => 47,
+      'zh_CN' => 96,
       'zh_HK' => 2,
       'zh_TW' => 2
     }.freeze
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake
index b3abc48f8e0..8627a326247 100644
--- a/lib/tasks/gitlab/shell.rake
+++ b/lib/tasks/gitlab/shell.rake
@@ -21,7 +21,6 @@ namespace :gitlab do
         config = {
           user: Gitlab.config.gitlab.user,
           gitlab_url: gitlab_url,
-          http_settings: { self_signed_cert: false }.stringify_keys,
           auth_file: File.join(user_home, ".ssh", "authorized_keys"),
           log_level: "INFO",
           audit_usernames: false