Merge branch 'ce-to-ee-2018-11-15' into 'master'

CE upstream - 2018-11-15 21:22 UTC

See merge request gitlab-org/gitlab-ee!8476

app/controllers/admin/impersonation_tokens_controller.rb

@@ -11,6 +11,7 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController
     @impersonation_token = finder.build(impersonation_token_params)
 
     if @impersonation_token.save
+      PersonalAccessToken.redis_store!(current_user.id, @impersonation_token.token)
       redirect_to admin_user_impersonation_tokens_path, notice: "A new impersonation token has been created."
     else
       set_index_vars
@@ -53,6 +54,8 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController
     @impersonation_token ||= finder.build
     @inactive_impersonation_tokens = finder(state: 'inactive').execute
     @active_impersonation_tokens = finder(state: 'active').execute.order(:expires_at)
+
+    @new_impersonation_token = PersonalAccessToken.redis_getdel(current_user.id)
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end

app/views/admin/impersonation_tokens/index.html.haml

@@ -5,6 +5,11 @@
 
 .row.prepend-top-default
   .col-lg-12
+    - if @new_impersonation_token
+      = render "shared/personal_access_tokens_created_container", new_token_value: @new_impersonation_token,
+                                                                 container_title: 'Your New Impersonation Token',
+                                                                 clipboard_button_title: 'Copy impersonation token to clipboard'
+
     = render "shared/personal_access_tokens_form", path: admin_user_impersonation_tokens_path, impersonation: true, token: @impersonation_token, scopes: @scopes
 
     = render "shared/personal_access_tokens_table", impersonation: true, active_tokens: @active_impersonation_tokens, inactive_tokens: @inactive_impersonation_tokens

app/views/profiles/personal_access_tokens/index.html.haml

@@ -14,17 +14,7 @@
 
   .col-lg-8
     - if @new_personal_access_token
-      .created-personal-access-token-container
-        %h5.prepend-top-0
-          Your New Personal Access Token
-        .form-group
-          .input-group
-            = text_field_tag 'created-personal-access-token', @new_personal_access_token, readonly: true, class: "form-control js-select-on-focus", 'aria-describedby' => "created-personal-access-token-help-block"
-            %span.input-group-append
-              = clipboard_button(text: @new_personal_access_token, title: "Copy personal access token to clipboard", placement: "left", class: "input-group-text btn-default btn-clipboard")
-          %span#created-personal-access-token-help-block.form-text.text-muted.text-danger Make sure you save it - you won't be able to access it again.
-
-      %hr
+      = render "shared/personal_access_tokens_created_container", new_token_value: @new_personal_access_token
 
     = render "shared/personal_access_tokens_form", path: profile_personal_access_tokens_path, impersonation: false, token: @personal_access_token, scopes: @scopes
 

app/views/shared/_personal_access_tokens_created_container.html.haml

+- container_title = local_assigns.fetch(:container_title, 'Your New Personal Access Token')
+- clipboard_button_title = local_assigns.fetch(:clipboard_button_title, 'Copy personal access token to clipboard')
+
+.created-personal-access-token-container
+  %h5.prepend-top-0
+    = container_title
+  .form-group
+    .input-group
+      = text_field_tag 'created-personal-access-token', new_token_value, readonly: true, class: "form-control js-select-on-focus", 'aria-describedby' => "created-token-help-block"
+      %span.input-group-append
+        = clipboard_button(text: new_token_value, title: clipboard_button_title, placement: "left", class: "input-group-text btn-default btn-clipboard")
+    %span#created-token-help-block.form-text.text-muted.text-danger Make sure you save it - you won't be able to access it again.
+
+%hr

app/views/shared/_personal_access_tokens_table.html.haml

@@ -15,8 +15,6 @@
           %th Created
           %th Expires
           %th Scopes
-          - if impersonation
-            %th Token
           %th
       %tbody
         - active_tokens.each do |token|
@@ -30,10 +28,6 @@
               - else
                 %span.token-never-expires-label Never
             %td= token.scopes.present? ? token.scopes.join(", ") : "<no scopes selected>"
-            - if impersonation
-              %td.token-token-container
-                = text_field_tag 'impersonation-token-token', token.token, readonly: true, class: "form-control"
-                = clipboard_button(text: token.token)
             - path = impersonation ? revoke_admin_user_impersonation_token_path(token.user, token) : revoke_profile_personal_access_token_path(token)
             %td= link_to "Revoke", path, method: :put, class: "btn btn-danger float-right", data: { confirm: "Are you sure you want to revoke this #{type} Token? This action cannot be undone." }
 - else

changelogs/unreleased/ce-53347_fix_impersonation_tokens.yml

+---
+title: Display impersonation token value only after creation
+merge_request: 22916
+author:
+type: fixed

changelogs/unreleased/frozen-string-lib-gitlab-even-more.yml

+---
+title: Enable even more frozen string in lib/gitlab/**/*.rb
+merge_request:
+author: gfyoung
+type: performance

doc/api/users.md

@@ -1077,7 +1077,6 @@ Example response:
 [
    {
       "active" : true,
-      "token" : "EsMo-vhKfXGwX9RKrwiy",
       "scopes" : [
          "api"
       ],
@@ -1094,7 +1093,6 @@ Example response:
          "read_user"
       ],
       "revoked" : true,
-      "token" : "ZcZRpLeEuQRprkRjYydY",
       "name" : "mytoken2",
       "created_at" : "2017-03-17T17:19:28.697Z",
       "id" : 3,
@@ -1130,7 +1128,6 @@ Example response:
 ```json
 {
    "active" : true,
-   "token" : "EsMo-vhKfXGwX9RKrwiy",
    "scopes" : [
       "api"
    ],
@@ -1147,6 +1144,8 @@ Example response:
 
 > Requires admin permissions.
 
+> Token values are returned once. Make sure you save it - you won't be able to access it again.
+
 It creates a new impersonation token. Note that only administrators can do this.
 You are only able to create impersonation tokens to impersonate the user and perform
 both API calls and Git reads and writes. The user will not see these tokens in their profile

lib/api/entities.rb

@@ -1291,7 +1291,11 @@ module API
       expose :token
     end
 
-    class ImpersonationToken < PersonalAccessTokenWithToken
+    class ImpersonationToken < PersonalAccessToken
+      expose :impersonation
+    end
+
+    class ImpersonationTokenWithToken < PersonalAccessTokenWithToken
       expose :impersonation
     end
 

lib/api/users.rb

@@ -537,7 +537,7 @@ module API
 
           desc 'Create a impersonation token. Available only for admins.' do
             detail 'This feature was introduced in GitLab 9.0'
-            success Entities::ImpersonationToken
+            success Entities::ImpersonationTokenWithToken
           end
           params do
             requires :name, type: String, desc: 'The name of the impersonation token'
@@ -548,7 +548,7 @@ module API
             impersonation_token = finder.build(declared_params(include_missing: false))
 
             if impersonation_token.save
-              present impersonation_token, with: Entities::ImpersonationToken
+              present impersonation_token, with: Entities::ImpersonationTokenWithToken
             else
               render_validation_error!(impersonation_token)
             end

lib/gitlab/fogbugz_import/client.rb

+# frozen_string_literal: true
+
 require 'fogbugz'
 
 module Gitlab

lib/gitlab/fogbugz_import/importer.rb

+# frozen_string_literal: true
+
 module Gitlab
   module FogbugzImport
     class Importer

lib/gitlab/fogbugz_import/project_creator.rb

+# frozen_string_literal: true
+
 module Gitlab
   module FogbugzImport
     class ProjectCreator

lib/gitlab/fogbugz_import/repository.rb

+# frozen_string_literal: true
+
 module Gitlab
   module FogbugzImport
     class Repository

lib/gitlab/gfm/reference_rewriter.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Gfm
     ##

lib/gitlab/gfm/uploads_rewriter.rb

+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Gitlab

lib/gitlab/git/attributes_at_ref_parser.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     # Parses root .gitattributes file at a given ref

lib/gitlab/git/attributes_parser.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     # Class for parsing Git attribute files and extracting the attributes for

lib/gitlab/git/blame.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Blame

lib/gitlab/git/blob.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: seems to be completely migrated (behind feature flags).
 
 module Gitlab

lib/gitlab/git/branch.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Branch < Ref

lib/gitlab/git/commit.rb

+# frozen_string_literal: true
+
 # Gitlab::Git::Commit is a wrapper around Gitaly::GitCommit
 module Gitlab
   module Git

lib/gitlab/git/commit_stats.rb

+# frozen_string_literal: true
+
 # Gitlab::Git::CommitStats counts the additions, deletions, and total changes
 # in a commit.
 module Gitlab

lib/gitlab/git/compare.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: no RPC's here.
 
 module Gitlab

lib/gitlab/git/conflict/file.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module Conflict

lib/gitlab/git/conflict/parser.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module Conflict

lib/gitlab/git/conflict/resolution.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module Conflict

lib/gitlab/git/conflict/resolver.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module Conflict

lib/gitlab/git/diff.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Diff

lib/gitlab/git/diff_collection.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: no RPC's here.
 
 module Gitlab

lib/gitlab/git/gitmodules_parser.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: no RPC's here.
 
 module Gitlab

lib/gitlab/git/hook_env.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: no RPC's here.
 
 module Gitlab

lib/gitlab/git/index.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Index

lib/gitlab/git/lfs_changes.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class LfsChanges

lib/gitlab/git/lfs_pointer_file.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class LfsPointerFile

lib/gitlab/git/operation_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class OperationService

lib/gitlab/git/path_helper.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: no RPC's here.
 
 module Gitlab

lib/gitlab/git/pre_receive_error.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     #

lib/gitlab/git/raw_diff_change.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     # This class behaves like a struct with fields :blob_id, :blob_size, :operation, :old_path, :new_path

lib/gitlab/git/ref.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Ref

lib/gitlab/git/remote_mirror.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class RemoteMirror

lib/gitlab/git/remote_repository.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     #

lib/gitlab/git/repository.rb

+# frozen_string_literal: true
+
 require 'tempfile'
 require 'forwardable'
 require "rubygems/package"

lib/gitlab/git/repository_mirroring.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module RepositoryMirroring

lib/gitlab/git/tag.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Tag < Ref

lib/gitlab/git/tree.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Tree

lib/gitlab/git/user.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class User

lib/gitlab/git/util.rb

+# frozen_string_literal: true
+
 # Gitaly note: JV: no RPC's here.
 
 module Gitlab

lib/gitlab/git/version.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module Version

lib/gitlab/git/wiki.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class Wiki

lib/gitlab/git/wiki_file.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class WikiFile

lib/gitlab/git/wiki_page.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class WikiPage

lib/gitlab/git/wiki_page_version.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     class WikiPageVersion

lib/gitlab/git/wraps_gitaly_errors.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Git
     module WrapsGitalyErrors

lib/gitlab/gitaly_client/attributes_bag.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     # This module expects an `ATTRS` const to be defined on the subclass

lib/gitlab/gitaly_client/blob_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class BlobService
@@ -15,7 +17,7 @@ module Gitlab
         )
         response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_blob, request, timeout: GitalyClient.fast_timeout)
 
-        data = ''
+        data = []
         blob = nil
         response.each do |msg|
           if blob.nil?
@@ -27,6 +29,8 @@ module Gitlab
 
         return nil if blob.oid.blank?
 
+        data = data.join
+
         Gitlab::Git::Blob.new(
           id: blob.oid,
           size: blob.size,

lib/gitlab/gitaly_client/blobs_stitcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class BlobsStitcher

lib/gitlab/gitaly_client/commit_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class CommitService
@@ -93,7 +95,7 @@ module Gitlab
         response = GitalyClient.call(@repository.storage, :commit_service, :tree_entry, request, timeout: GitalyClient.medium_timeout)
 
         entry = nil
-        data = ''
+        data = []
         response.each do |msg|
           if entry.nil?
             entry = msg
@@ -103,7 +105,7 @@ module Gitlab
 
           data << msg.data
         end
-        entry.data = data
+        entry.data = data.join
 
         entry unless entry.oid.blank?
       end
@@ -254,7 +256,7 @@ module Gitlab
         )
 
         response = GitalyClient.call(@repository.storage, :commit_service, :raw_blame, request, timeout: GitalyClient.medium_timeout)
-        response.reduce("") { |memo, msg| memo << msg.data }
+        response.reduce([]) { |memo, msg| memo << msg.data }.join
       end
 
       def find_commit(revision)
@@ -345,8 +347,8 @@ module Gitlab
         request = Gitaly::ExtractCommitSignatureRequest.new(repository: @gitaly_repo, commit_id: commit_id)
         response = GitalyClient.call(@repository.storage, :commit_service, :extract_commit_signature, request)
 
-        signature = ''.b
-        signed_text = ''.b
+        signature = +''.b
+        signed_text = +''.b
 
         response.each do |message|
           signature << message.signature
@@ -364,7 +366,7 @@ module Gitlab
         request = Gitaly::GetCommitSignaturesRequest.new(repository: @gitaly_repo, commit_ids: commit_ids)
         response = GitalyClient.call(@repository.storage, :commit_service, :get_commit_signatures, request, timeout: GitalyClient.fast_timeout)
 
-        signatures = Hash.new { |h, k| h[k] = [''.b, ''.b] }
+        signatures = Hash.new { |h, k| h[k] = [+''.b, +''.b] }
         current_commit_id = nil
 
         response.each do |message|
@@ -383,7 +385,7 @@ module Gitlab
         request = Gitaly::GetCommitMessagesRequest.new(repository: @gitaly_repo, commit_ids: commit_ids)
         response = GitalyClient.call(@repository.storage, :commit_service, :get_commit_messages, request, timeout: GitalyClient.fast_timeout)
 
-        messages = Hash.new { |h, k| h[k] = ''.b }
+        messages = Hash.new { |h, k| h[k] = +''.b }
         current_commit_id = nil
 
         response.each do |rpc_message|

lib/gitlab/gitaly_client/conflict_files_stitcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class ConflictFilesStitcher
@@ -17,7 +19,7 @@ module Gitlab
 
               current_file = file_from_gitaly_header(gitaly_file.header)
             else
-              current_file.raw_content << gitaly_file.content
+              current_file.raw_content = "#{current_file.raw_content}#{gitaly_file.content}"
             end
           end
         end

lib/gitlab/gitaly_client/conflicts_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class ConflictsService

lib/gitlab/gitaly_client/diff.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class Diff

lib/gitlab/gitaly_client/diff_stitcher.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class DiffStitcher
@@ -20,7 +22,7 @@ module Gitlab
 
             current_diff = GitalyClient::Diff.new(diff_params)
           else
-            current_diff.patch += diff_msg.raw_patch_data
+            current_diff.patch = "#{current_diff.patch}#{diff_msg.raw_patch_data}"
           end
 
           if diff_msg.end_of_patch

lib/gitlab/gitaly_client/health_check_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class HealthCheckService

lib/gitlab/gitaly_client/namespace_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class NamespaceService

lib/gitlab/gitaly_client/notification_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class NotificationService

lib/gitlab/gitaly_client/operation_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class OperationService

lib/gitlab/gitaly_client/queue_enumerator.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class QueueEnumerator

lib/gitlab/gitaly_client/ref_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class RefService
@@ -225,7 +227,7 @@ module Gitlab
         request = Gitaly::GetTagMessagesRequest.new(repository: @gitaly_repo, tag_ids: tag_ids)
         response = GitalyClient.call(@repository.storage, :ref_service, :get_tag_messages, request, timeout: GitalyClient.fast_timeout)
 
-        messages = Hash.new { |h, k| h[k] = ''.b }
+        messages = Hash.new { |h, k| h[k] = +''.b }
         current_tag_id = nil
 
         response.each do |rpc_message|

lib/gitlab/gitaly_client/remote_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class RemoteService

lib/gitlab/gitaly_client/repository_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class RepositoryService
@@ -56,9 +58,9 @@ module Gitlab
         request = Gitaly::GetInfoAttributesRequest.new(repository: @gitaly_repo)
 
         response = GitalyClient.call(@storage, :repository_service, :get_info_attributes, request, timeout: GitalyClient.fast_timeout)
-        response.each_with_object("") do |message, attributes|
+        response.each_with_object([]) do |message, attributes|
           attributes << message.attributes
-        end
+        end.join
       end
 
       def fetch_remote(remote, ssh_auth:, forced:, no_tags:, timeout:, prune: true)

lib/gitlab/gitaly_client/server_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     # Meant for extraction of server data, and later maybe to perform misc task

lib/gitlab/gitaly_client/storage_service.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class StorageService

lib/gitlab/gitaly_client/storage_settings.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     # This is a chokepoint that is meant to help us stop remove all places

lib/gitlab/gitaly_client/util.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     module Util

lib/gitlab/gitaly_client/wiki_file.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class WikiFile

lib/gitlab/gitaly_client/wiki_page.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitalyClient
     class WikiPage

lib/gitlab/gitaly_client/wiki_service.rb

+# frozen_string_literal: true
+
 require 'stringio'
 
 module Gitlab
@@ -139,7 +141,7 @@ module Gitlab
           next unless message.name.present? || wiki_file
 
           if wiki_file
-            wiki_file.raw_data << message.raw_data
+            wiki_file.raw_data = "#{wiki_file.raw_data}#{message.raw_data}"
           else
             wiki_file = GitalyClient::WikiFile.new(message.to_h)
             # All gRPC strings in a response are frozen, so we get
@@ -160,7 +162,7 @@ module Gitlab
         )
 
         response = GitalyClient.call(@repository.storage, :wiki_service, :wiki_get_formatted_data, request)
-        response.reduce("") { |memo, msg| memo << msg.data }
+        response.reduce([]) { |memo, msg| memo << msg.data }.join
       end
 
       private

lib/gitlab/gitlab_import/client.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitlabImport
     class Client

lib/gitlab/gitlab_import/importer.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitlabImport
     class Importer
@@ -22,22 +24,22 @@ module Gitlab
           issues = client.issues(project_identifier)
 
           issues.each do |issue|
-            body = @formatter.author_line(issue["author"]["name"])
-            body += issue["description"]
+            body = [@formatter.author_line(issue["author"]["name"])]
+            body << issue["description"]
 
             comments = client.issue_comments(project_identifier, issue["iid"])
 
             if comments.any?
-              body += @formatter.comments_header
+              body << @formatter.comments_header
             end
 
             comments.each do |comment|
-              body += @formatter.comment(comment["author"]["name"], comment["created_at"], comment["body"])
+              body << @formatter.comment(comment["author"]["name"], comment["created_at"], comment["body"])
             end
 
             project.issues.create!(
               iid: issue["iid"],
-              description: body,
+              description: body.join,
               title: issue["title"],
               state: issue["state"],
               updated_at: issue["updated_at"],

lib/gitlab/gitlab_import/project_creator.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GitlabImport
     class ProjectCreator

lib/gitlab/google_code_import/client.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GoogleCodeImport
     class Client

lib/gitlab/google_code_import/importer.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GoogleCodeImport
     class Importer

lib/gitlab/google_code_import/project_creator.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GoogleCodeImport
     class ProjectCreator

lib/gitlab/google_code_import/repository.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GoogleCodeImport
     class Repository

lib/gitlab/gpg/commit.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Gpg
     class Commit

lib/gitlab/gpg/invalid_gpg_signature_updater.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Gpg
     class InvalidGpgSignatureUpdater

lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb

+# frozen_string_literal: true
+
 module Gitlab
   module GrapeLogging
     module Formatters

lib/gitlab/grape_logging/loggers/queue_duration_logger.rb

+# frozen_string_literal: true
+
 # This grape_logging module (https://github.com/aserafin/grape_logging) makes it
 # possible to log how much time an API request was queued by Workhorse.
 module Gitlab

lib/gitlab/grape_logging/loggers/user_logger.rb

+# frozen_string_literal: true
+
 # This grape_logging module (https://github.com/aserafin/grape_logging) makes it
 # possible to log the user who performed the Grape API action by retrieving
 # the user context from the request environment.

lib/gitlab/graphql/authorize.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     # Allow fields to declare permissions their objects must have. The field

lib/gitlab/graphql/authorize/authorize_resource.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Authorize

lib/gitlab/graphql/authorize/instrumentation.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Authorize

lib/gitlab/graphql/connections.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Connections

lib/gitlab/graphql/connections/keyset_connection.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Connections

lib/gitlab/graphql/errors.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Errors

lib/gitlab/graphql/expose_permissions.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module ExposePermissions

lib/gitlab/graphql/present.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Present

lib/gitlab/graphql/present/instrumentation.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     module Present

lib/gitlab/graphql/variables.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphql
     class Variables

lib/gitlab/graphs/commits.rb

+# frozen_string_literal: true
+
 module Gitlab
   module Graphs
     class Commits

lib/gitlab/hashed_storage/migrator.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HashedStorage
     # Hashed Storage Migrator

lib/gitlab/hashed_storage/rake_helper.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HashedStorage
     module RakeHelper

lib/gitlab/health_checks/base_abstract_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     module BaseAbstractCheck

lib/gitlab/health_checks/db_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     class DbCheck

lib/gitlab/health_checks/gitaly_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     class GitalyCheck

lib/gitlab/health_checks/metric.rb

-module Gitlab::HealthChecks # rubocop:disable Naming/FileName
+# rubocop:disable Naming/FileName
+# frozen_string_literal: true
+
+module Gitlab::HealthChecks
   Metric = Struct.new(:name, :value, :labels)
 end

lib/gitlab/health_checks/prometheus_text_format.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     class PrometheusTextFormat

lib/gitlab/health_checks/redis/cache_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     module Redis

lib/gitlab/health_checks/redis/queues_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     module Redis

lib/gitlab/health_checks/redis/redis_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     module Redis

lib/gitlab/health_checks/redis/shared_state_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     module Redis

lib/gitlab/health_checks/result.rb

-module Gitlab::HealthChecks # rubocop:disable Naming/FileName
+# rubocop:disable Naming/FileName
+# frozen_string_literal: true
+
+module Gitlab::HealthChecks
   Result = Struct.new(:success, :message, :labels)
 end

lib/gitlab/health_checks/simple_abstract_check.rb

+# frozen_string_literal: true
+
 module Gitlab
   module HealthChecks
     module SimpleAbstractCheck

qa/qa/page/profile/personal_access_tokens.rb

@@ -8,7 +8,7 @@ module QA
           element :scopes_api_radios, "label :scopes" # rubocop:disable QA/ElementWithPattern
         end
 
-        view 'app/views/profiles/personal_access_tokens/index.html.haml' do
+        view 'app/views/shared/_personal_access_tokens_created_container.html.haml' do
           element :create_token_field, "text_field_tag 'created-personal-access-token'" # rubocop:disable QA/ElementWithPattern
         end
 

spec/controllers/profiles/personal_access_tokens_controller_spec.rb

@@ -39,8 +39,10 @@ describe Profiles::PersonalAccessTokensController do
     let!(:active_personal_access_token) { create(:personal_access_token, user: user) }
     let!(:inactive_personal_access_token) { create(:personal_access_token, :revoked, user: user) }
     let!(:impersonation_personal_access_token) { create(:personal_access_token, :impersonation, user: user) }
+    let(:token_value) { 's3cr3t' }
 
     before do
+      PersonalAccessToken.redis_store!(user.id, token_value)
       get :index
     end
 
@@ -56,5 +58,9 @@ describe Profiles::PersonalAccessTokensController do
       expect(assigns(:active_personal_access_tokens)).not_to include(impersonation_personal_access_token)
       expect(assigns(:inactive_personal_access_tokens)).not_to include(impersonation_personal_access_token)
     end
+
+    it "retrieves newly created personal access token value" do
+      expect(assigns(:new_personal_access_token)).to eql(token_value)
+    end
   end
 end

spec/features/admin/admin_users_impersonation_tokens_spec.rb

@@ -12,6 +12,10 @@ describe 'Admin > Users > Impersonation Tokens', :js do
     find(".settings-message")
   end
 
+  def created_impersonation_token
+    find("#created-personal-access-token").value
+  end
+
   before do
     sign_in(admin)
   end
@@ -39,6 +43,7 @@ describe 'Admin > Users > Impersonation Tokens', :js do
       expect(active_impersonation_tokens).to have_text('api')
       expect(active_impersonation_tokens).to have_text('read_user')
       expect(PersonalAccessTokensFinder.new(impersonation: true).execute.count).to equal(1)
+      expect(created_impersonation_token).not_to be_empty
     end
   end
 

spec/features/profiles/personal_access_tokens_spec.rb

@@ -43,10 +43,12 @@ describe 'Profile > Personal Access Tokens', :js do
       check "read_user"
 
       click_on "Create personal access token"
+
       expect(active_personal_access_tokens).to have_text(name)
       expect(active_personal_access_tokens).to have_text('In')
       expect(active_personal_access_tokens).to have_text('api')
       expect(active_personal_access_tokens).to have_text('read_user')
+      expect(created_personal_access_token).not_to be_empty
     end
 
     context "when creation fails" do
@@ -57,6 +59,7 @@ describe 'Profile > Personal Access Tokens', :js do
 
         expect { click_on "Create personal access token" }.not_to change { PersonalAccessToken.count }
         expect(page).to have_content("Name cannot be nil")
+        expect(page).not_to have_selector("#created-personal-access-token")
       end
     end
   end

spec/requests/api/users_spec.rb

@@ -2051,11 +2051,11 @@ describe API::Users do
       expect(json_response['message']).to eq('403 Forbidden')
     end
 
-    it 'returns a personal access token' do
+    it 'returns an impersonation token' do
       get api("/users/#{user.id}/impersonation_tokens/#{impersonation_token.id}", admin)
 
       expect(response).to have_gitlab_http_status(200)
-      expect(json_response['token']).to be_present
+      expect(json_response['token']).not_to be_present
       expect(json_response['impersonation']).to be_truthy
     end
   end