Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/ide/stores/mutations.js

@@ -73,16 +73,15 @@ export default {
       const entry = data.entries[key];
       const foundEntry = state.entries[key];
+      // NOTE: We can't clone `entry` in any of the below assignments because
+      // we need `state.entries` and the `entry.tree` to reference the same object.
       if (!foundEntry) {
         Object.assign(state.entries, {
           [key]: entry,
         });
       } else if (foundEntry.deleted) {
         Object.assign(state.entries, {
-          [key]: {
-            ...entry,
-            replaces: true,
-          },
+          [key]: Object.assign(entry, { replaces: true }),
         });
       } else {
         const tree = entry.tree.filter(

app/assets/javascripts/registry/components/app.vue

@@ -15,15 +15,19 @@ export default {
     GlLoadingIcon,
   },
   props: {
-    endpoint: {
-      type: String,
-      required: true,
-    },
     characterError: {
       type: Boolean,
       required: false,
       default: false,
     },
+    containersErrorImage: {
+      type: String,
+      required: true,
+    },
+    endpoint: {
+      type: String,
+      required: true,
+    },
     helpPagePath: {
       type: String,
       required: true,
@@ -32,7 +36,11 @@ export default {
       type: String,
       required: true,
     },
-    containersErrorImage: {
+    personalAccessTokensHelpLink: {
+      type: String,
+      required: true,
+    },
+    registryHostUrlWithPort: {
       type: String,
       required: true,
     },
@@ -40,6 +48,10 @@ export default {
       type: String,
       required: true,
     },
+    twoFactorAuthHelpLink: {
+      type: String,
+      required: true,
+    },
   },
   store,
   computed: {
@@ -79,6 +91,26 @@ export default {
         false,
       );
     },
+    notLoggedInToRegistryText() {
+      return sprintf(
+        s__(`ContainerRegistry|If you are not already logged in, you need to authenticate to
+             the Container Registry by using your GitLab username and password. If you have
+             %{twofaDocLinkStart}Two-Factor Authentication%{twofaDocLinkEnd} enabled, use a
+             %{personalAccessTokensDocLinkStart}Personal Access Token
+             %{personalAccessTokensDocLinkEnd}instead of a password.`),
+        {
+          twofaDocLinkStart: `<a href="${this.twoFactorAuthHelpLink}" target="_blank">`,
+          twofaDocLinkEnd: '</a>',
+          personalAccessTokensDocLinkStart: `<a href="${this.personalAccessTokensHelpLink}" target="_blank">`,
+          personalAccessTokensDocLinkEnd: '</a>',
+        },
+        false,
+      );
+    },
+    dockerLoginCommand() {
+      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      return `docker login ${this.registryHostUrlWithPort}`;
+    },
     dockerBuildCommand() {
       // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
       return `docker build -t ${this.repositoryUrl} .`;
@@ -130,6 +162,17 @@ export default {
       <template #description>
         <p class="js-no-container-images-text" v-html="noContainerImagesText"></p>
         <h5>{{ s__('ContainerRegistry|Quick Start') }}</h5>
+        <p class="js-not-logged-in-to-registry-text" v-html="notLoggedInToRegistryText"></p>
+        <div class="input-group append-bottom-10">
+          <input :value="dockerLoginCommand" type="text" class="form-control monospace" readonly />
+          <span class="input-group-append">
+            <clipboard-button
+              :text="dockerLoginCommand"
+              :title="s__('ContainerRegistry|Copy login command')"
+              class="input-group-text"
+            />
+          </span>
+        </div>
         <p>
           {{
             s__(

app/assets/javascripts/registry/index.js

@@ -13,23 +13,29 @@ export default () =>
     data() {
       const { dataset } = document.querySelector(this.$options.el);
       return {
-        endpoint: dataset.endpoint,
         characterError: Boolean(dataset.characterError),
+        containersErrorImage: dataset.containersErrorImage,
+        endpoint: dataset.endpoint,
         helpPagePath: dataset.helpPagePath,
         noContainersImage: dataset.noContainersImage,
-        containersErrorImage: dataset.containersErrorImage,
+        personalAccessTokensHelpLink: dataset.personalAccessTokensHelpLink,
+        registryHostUrlWithPort: dataset.registryHostUrlWithPort,
         repositoryUrl: dataset.repositoryUrl,
+        twoFactorAuthHelpLink: dataset.twoFactorAuthHelpLink,
       };
     },
     render(createElement) {
       return createElement('registry-app', {
         props: {
-          endpoint: this.endpoint,
           characterError: this.characterError,
+          containersErrorImage: this.containersErrorImage,
+          endpoint: this.endpoint,
           helpPagePath: this.helpPagePath,
           noContainersImage: this.noContainersImage,
-          containersErrorImage: this.containersErrorImage,
+          personalAccessTokensHelpLink: this.personalAccessTokensHelpLink,
+          registryHostUrlWithPort: this.registryHostUrlWithPort,
           repositoryUrl: this.repositoryUrl,
+          twoFactorAuthHelpLink: this.twoFactorAuthHelpLink,
         },
       });
     },

app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue

@@ -39,9 +39,6 @@ export default {
     ariaLabel() {
       return this.isCollapsed ? __('Expand') : __('Collapse');
     },
-    isButtonDisabled() {
-      return this.isLoading || this.hasError;
-    },
   },
   methods: {
     toggleCollapsed() {
@@ -53,25 +50,35 @@ export default {
 <template>
   <div>
     <div class="mr-widget-extension d-flex align-items-center pl-3">
-      <gl-button
-        class="btn-blank btn s32 square append-right-default"
-        :aria-label="ariaLabel"
-        :disabled="isButtonDisabled"
-        @click="toggleCollapsed"
-      >
-        <gl-loading-icon v-if="isLoading" />
-        <icon v-else :name="arrowIconName" class="js-icon" />
-      </gl-button>
-      <gl-button
-        variant="link"
-        class="js-title"
-        :disabled="isButtonDisabled"
-        :class="{ 'border-0': isButtonDisabled }"
-        @click="toggleCollapsed"
-      >
-        <template v-if="isCollapsed">{{ title }}</template>
-        <template v-else>{{ __('Collapse') }}</template>
-      </gl-button>
+      <div v-if="hasError" class="ci-widget media">
+        <div class="media-body">
+          <span class="gl-font-size-small mr-widget-margin-left gl-line-height-24 js-error-state">{{
+            title
+          }}</span>
+        </div>
+      </div>
+
+      <template v-else>
+        <gl-button
+          class="btn-blank btn s32 square append-right-default"
+          :aria-label="ariaLabel"
+          :disabled="isLoading"
+          @click="toggleCollapsed"
+        >
+          <gl-loading-icon v-if="isLoading" />
+          <icon v-else :name="arrowIconName" class="js-icon" />
+        </gl-button>
+        <gl-button
+          variant="link"
+          class="js-title"
+          :disabled="isLoading"
+          :class="{ 'border-0': isLoading }"
+          @click="toggleCollapsed"
+        >
+          <template v-if="isCollapsed">{{ title }}</template>
+          <template v-else>{{ __('Collapse') }}</template>
+        </gl-button>
+      </template>
     </div>
     <div v-if="!isCollapsed" class="border-top js-slot-container">

app/assets/stylesheets/framework/common.scss

@@ -560,3 +560,6 @@ img.emoji {
     }
   }
 }
+
+.gl-font-size-small { font-size: $gl-font-size-small; }
+.gl-line-height-24 { line-height: $gl-line-height-24; }

app/assets/stylesheets/framework/variables.scss

@@ -833,6 +833,7 @@ Merge Requests
 */
 $mr-tabs-height: 48px;
 $mr-version-controls-height: 56px;
+$mr-widget-margin-left: 40px;
 /*
 Compare Branches

app/assets/stylesheets/pages/merge_requests.scss

@@ -19,6 +19,8 @@
   border-top: 1px solid $border-color;
 }
+.mr-widget-margin-left { margin-left: $mr-widget-margin-left; }
+
 .media-section {
   @include media-breakpoint-down(md) {
     align-items: flex-start;

app/helpers/application_helper.rb

@@ -108,6 +108,11 @@ module ApplicationHelper
     Gitlab.config.extra
   end
+  # shortcut for gitlab registry config
+  def registry_config
+    Gitlab.config.registry
+  end
+
   # Render a `time` element with Javascript-based relative date and tooltip
   #
   # time       - Time object

app/models/container_repository.rb

@@ -67,7 +67,7 @@ class ContainerRepository < ApplicationRecord
   def delete_tags!
     return unless has_tags?
-    digests = tags.map { |tag| tag.digest }.to_set
+    digests = tags.map { |tag| tag.digest }.compact.to_set
     digests.all? do |digest|
       delete_tag_by_digest(digest)

app/services/projects/container_repository/delete_tags_service.rb

@@ -48,10 +48,10 @@ module Projects
         # rubocop: disable CodeReuse/ActiveRecord
         Gitlab::Sentry.track_exception(ArgumentError.new('multiple tag digests')) if tag_digests.many?
-        # deletes the dummy image
-        # all created tag digests are the same since they all have the same dummy image.
+        # Deletes the dummy image
+        # All created tag digests are the same since they all have the same dummy image.
         # a single delete is sufficient to remove all tags with it
-        if container_repository.client.delete_repository_tag(container_repository.path, tag_digests.first)
+        if container_repository.delete_tag_by_digest(tag_digests.first)
           success(deleted: tag_names)
         else
           error('could not delete tags')

app/views/projects/registry/repositories/index.html.haml

@@ -5,7 +5,10 @@
     .col-12
       #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json),
         "help_page_path" => help_page_path('user/packages/container_registry/index'),
+        "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'),
+        "personal_access_tokens_help_link" => help_page_path('user/profile/personal_access_tokens'),
         "no_containers_image" => image_path('illustrations/docker-empty-state.svg'),
         "containers_error_image" => image_path('illustrations/docker-error-state.svg'),
         "repository_url" => escape_once(@project.container_registry_url),
+        "registry_host_url_with_port" => escape_once(registry_config.host_port),
         character_error: @character_error.to_s } }

app/views/shared/_allow_request_access.html.haml

@@ -3,6 +3,4 @@
 .form-check
   = form.check_box :request_access_enabled, class: 'form-check-input', data: { qa_selector: 'request_access_checkbox' }
   = form.label :request_access_enabled, class: 'form-check-label' do
-    %span{ class: label_class }= _('Allow users to request access')
-    %br
-    %span.text-muted= _('Allow users to request access if visibility is public or internal.')
+    %span{ class: label_class }= _('Allow users to request access (if visibility is public or internal)')

changelogs/unreleased/18217-request-access-to-project-should-be-on-by-default.yml

+---
+title: Enable Request Access functionality by default for new projects and groups
+merge_request: 17662
+author:
+type: changed

changelogs/unreleased/29881-fix-ide-delete-and-readd.yml

+---
+title: Fix Web IDE tree not updating modified status
+merge_request: 18647
+author:
+type: fixed

changelogs/unreleased/feature-add-copyable-login-with-copy-to-empty-container-registry-view.yml

+---
+title: Adds login input with copy box and supporting copy to empty container registry view
+merge_request: 18244
+author: nate geslin
+type: added

changelogs/unreleased/issue_11240.yml

+---
+title: Expose subscribed attribute for epic on API
+merge_request: 18475
+author:
+type: added

config/initializers/7_prometheus_metrics.rb

@@ -34,6 +34,12 @@ Sidekiq.configure_server do |config|
   config.on(:startup) do
     # webserver metrics are cleaned up in config.ru: `warmup` block
     Prometheus::CleanupMultiprocDirService.new.execute
+    # In production, sidekiq is run in a multi-process setup where processes might interfere
+    # with each other cleaning up and reinitializing prometheus database files, which is why
+    # we're re-doing the work every time here.
+    # A cleaner solution would be to run the cleanup pre-fork, and the initialization once
+    # after all workers have forked, but I don't know how at this point.
+    ::Prometheus::Client.reinitialize_on_pid_change(force: true)
     Gitlab::Metrics::Exporter::SidekiqExporter.instance.start
   end

db/migrate/20190925055714_default_request_access_groups.rb

+# frozen_string_literal: true
+
+class DefaultRequestAccessGroups < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    change_column_default :namespaces, :request_access_enabled, true
+  end
+
+  def down
+    change_column_default :namespaces, :request_access_enabled, false
+  end
+end

db/migrate/20190925055902_default_request_access_projects.rb

+# frozen_string_literal: true
+
+class DefaultRequestAccessProjects < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    change_column_default :projects, :request_access_enabled, true
+  end
+
+  def down
+    change_column_default :projects, :request_access_enabled, false
+  end
+end

db/schema.rb

@@ -2333,7 +2333,7 @@ ActiveRecord::Schema.define(version: 2019_10_04_133612) do
     t.boolean "membership_lock", default: false
     t.boolean "share_with_group_lock", default: false
     t.integer "visibility_level", default: 20, null: false
-    t.boolean "request_access_enabled", default: false, null: false
+    t.boolean "request_access_enabled", default: true, null: false
     t.string "ldap_sync_status", default: "ready", null: false
     t.string "ldap_sync_error"
     t.datetime "ldap_sync_last_update_at"
@@ -2922,7 +2922,7 @@ ActiveRecord::Schema.define(version: 2019_10_04_133612) do
     t.boolean "has_external_issue_tracker"
     t.string "repository_storage", default: "default", null: false
     t.boolean "repository_read_only"
-    t.boolean "request_access_enabled", default: false, null: false
+    t.boolean "request_access_enabled", default: true, null: false
     t.boolean "has_external_wiki"
     t.string "ci_config_path"
     t.boolean "lfs_enabled"