Add latest changes from gitlab-org/gitlab@master

5 files changed, 3 insertions, 30 deletions

diff --git a/lib/gitlab/background_migration/mailers/unconfirm_mailer.rb b/lib/gitlab/background_migration/mailers/unconfirm_mailer.rb
index 3605b157f4f..c096dae0631 100644
--- a/lib/gitlab/background_migration/mailers/unconfirm_mailer.rb
+++ b/lib/gitlab/background_migration/mailers/unconfirm_mailer.rb
@@ -14,7 +14,7 @@ module Gitlab
           mail(
             template_path: 'unconfirm_mailer',
             template_name: 'unconfirm_notification_email',
-            to: @user.notification_email_or_default,
+            to: @user.notification_email,
             subject: subject('GitLab email verification request')
           )
         end
diff --git a/lib/gitlab/ci/pipeline/seed/processable/resource_group.rb b/lib/gitlab/ci/pipeline/seed/processable/resource_group.rb
index d0ecfff4f34..a29fef6eb34 100644
--- a/lib/gitlab/ci/pipeline/seed/processable/resource_group.rb
+++ b/lib/gitlab/ci/pipeline/seed/processable/resource_group.rb
@@ -35,7 +35,7 @@ module Gitlab
             def variables
               processable.simple_variables.tap do |variables|
                 # Adding persisted environment variables
-                if Feature.enabled?(:env_vars_resource_group) && processable.persisted_environment.present?
+                if processable.persisted_environment.present?
                   variables.concat(processable.persisted_environment.predefined_variables)
                 end
               end
diff --git a/lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml
index 3e7fa579595..081a3a6cc78 100644
--- a/lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml
@@ -31,8 +31,3 @@ deploy:
     - build
   environment:
     name: $TF_STATE_NAME
-
-cleanup:
-  extends: .terraform:destroy
-  dependencies:
-    - deploy
diff --git a/lib/gitlab/git/user.rb b/lib/gitlab/git/user.rb
index 0798cc51055..05ae3391040 100644
--- a/lib/gitlab/git/user.rb
+++ b/lib/gitlab/git/user.rb
@@ -6,7 +6,7 @@ module Gitlab
       attr_reader :username, :name, :email, :gl_id, :timezone
 
       def self.from_gitlab(gitlab_user)
-        new(gitlab_user.username, gitlab_user.name, gitlab_user.commit_email_or_default, Gitlab::GlId.gl_id(gitlab_user), gitlab_user.timezone)
+        new(gitlab_user.username, gitlab_user.name, gitlab_user.commit_email, Gitlab::GlId.gl_id(gitlab_user), gitlab_user.timezone)
       end
 
       def self.from_gitaly(gitaly_user)
diff --git a/lib/gitlab/gitaly_client/ref_service.rb b/lib/gitlab/gitaly_client/ref_service.rb
index 2dafe0e12ba..235eef4575e 100644
--- a/lib/gitlab/gitaly_client/ref_service.rb
+++ b/lib/gitlab/gitaly_client/ref_service.rb
@@ -62,28 +62,6 @@ module Gitlab
         consume_refs_response(response) { |name| Gitlab::Git.tag_name(name) }
       end
 
-      def list_new_blobs(newrev, limit = 0, dynamic_timeout: nil)
-        request = Gitaly::ListNewBlobsRequest.new(
-          repository: @gitaly_repo,
-          commit_id: newrev,
-          limit: limit
-        )
-
-        timeout =
-          if dynamic_timeout
-            [dynamic_timeout, GitalyClient.medium_timeout].min
-          else
-            GitalyClient.medium_timeout
-          end
-
-        response = GitalyClient.call(@storage, :ref_service, :list_new_blobs, request, timeout: timeout)
-        response.flat_map do |msg|
-          # Returns an Array of Gitaly::NewBlobObject objects
-          # Available methods are: #size, #oid and #path
-          msg.new_blob_objects
-        end
-      end
-
       def count_tag_names
         tag_names.count
       end