Merge commit '207d3100' into 11-9-stable-prepare-rc4

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

@@ -243,7 +243,7 @@ export default {
   methods: {
     handleCancelClick() {
       eventHub.$emit('openConfirmationModal', {
-        pipelineId: this.pipeline.id,
+        pipeline: this.pipeline,
         endpoint: this.pipeline.cancel_path,
       });
     },

app/assets/javascripts/projects/project_new.js

@@ -125,10 +125,18 @@ const bindEvents = () => {
         text: 'Spring',
         icon: '.template-option .icon-spring',
       },
+      iosswift: {
+        text: 'iOS (Swift)',
+        icon: '.template-option svg.icon-gitlab',
+      },
       dotnetcore: {
         text: '.NET Core',
         icon: '.template-option .icon-dotnet',
       },
+      android: {
+        text: 'Android',
+        icon: '.template-option svg.icon-android',
+      },
       gomicro: {
         text: 'Go Micro',
         icon: '.template-option .icon-gomicro',

app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue

@@ -66,19 +66,23 @@ export default {
       import(/* webpackChunkName: 'emoji' */ '~/emoji')
         .then(Emoji => {
-          if (this.emoji) {
-            this.emojiTag = Emoji.glEmojiTag(this.emoji);
-          }
-          this.noEmoji = this.emoji === '';
-          this.defaultEmojiTag = Emoji.glEmojiTag('speech_balloon');
-          this.emojiMenu = new EmojiMenuInModal(
-            Emoji,
-            toggleEmojiMenuButtonSelector,
-            emojiMenuClass,
-            this.setEmoji,
-            this.$refs.userStatusForm,
-          );
+          Emoji.initEmojiMap()
+            .then(() => {
+              if (this.emoji) {
+                this.emojiTag = Emoji.glEmojiTag(this.emoji);
+              }
+              this.noEmoji = this.emoji === '';
+              this.defaultEmojiTag = Emoji.glEmojiTag('speech_balloon');
+              this.emojiMenu = new EmojiMenuInModal(
+                Emoji,
+                toggleEmojiMenuButtonSelector,
+                emojiMenuClass,
+                this.setEmoji,
+                this.$refs.userStatusForm,
+              );
+            })
+            .catch(() => createFlash(__('Failed to load emoji list.')));
         })
         .catch(() => createFlash(__('Failed to load emoji list.')));
     },

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

@@ -135,7 +135,7 @@ export default {
         <span class="dropdown">
           <button
             type="button"
-            class="btn dropdown-toggle"
+            class="btn dropdown-toggle qa-dropdown-toggle"
             data-toggle="dropdown"
             aria-label="Download as"
             aria-haspopup="true"
@@ -145,12 +145,20 @@ export default {
           </button>
           <ul class="dropdown-menu dropdown-menu-right">
             <li>
-              <a :href="mr.emailPatchesPath" class="js-download-email-patches" download>
+              <a
+                :href="mr.emailPatchesPath"
+                class="js-download-email-patches qa-download-email-patches"
+                download
+              >
                 {{ s__('mrWidget|Email patches') }}
               </a>
             </li>
             <li>
-              <a :href="mr.plainDiffPath" class="js-download-plain-diff" download>
+              <a
+                :href="mr.plainDiffPath"
+                class="js-download-plain-diff qa-download-plain-diff"
+                download
+              >
                 {{ s__('mrWidget|Plain diff') }}
               </a>
             </li>

app/assets/javascripts/vue_merge_request_widget/components/states/commit_message_dropdown.vue

@@ -20,7 +20,6 @@ export default {
   <div>
     <gl-dropdown
       right
-      no-caret
       text="Use an existing commit message"
       variant="link"
       class="mr-commit-dropdown"

app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue

@@ -329,7 +329,7 @@ export default {
         >
           <ul class="border-top content-list commits-list flex-list">
             <commit-edit
-              v-if="squashBeforeMerge"
+              v-if="squashBeforeMerge && shouldShowSquashBeforeMerge"
               v-model="squashCommitMessage"
               :label="__('Squash commit message')"
               input-id="squash-message-edit"

app/assets/stylesheets/application.scss

@@ -3,7 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require jquery.atwho
- *= require select2
  *= require_self
  *= require cropper.css
 */
@@ -18,6 +17,7 @@
 @import "../../../node_modules/pikaday/scss/pikaday";
 @import "../../../node_modules/dropzone/dist/basic";
+@import "../../../node_modules/select2/select2";
 /*
  * GitLab UI framework

app/assets/stylesheets/framework/contextual_sidebar.scss

@@ -5,7 +5,7 @@
     padding-left: $contextual-sidebar-collapsed-width;
   }
-  @include media-breakpoint-up(lg) {
+  @include media-breakpoint-up(xl) {
     padding-left: $contextual-sidebar-width;
   }
@@ -15,7 +15,7 @@
 }
 .page-with-icon-sidebar {
-  @include media-breakpoint-up(sm) {
+  @include media-breakpoint-up(md) {
     padding-left: $contextual-sidebar-collapsed-width;
   }
 }
@@ -71,6 +71,44 @@
   }
 }
+@mixin collapse-contextual-sidebar-content {
+  .context-header {
+    height: 60px;
+    width: $contextual-sidebar-collapsed-width;
+
+    a {
+      padding: 10px 4px;
+    }
+  }
+
+  .sidebar-top-level-items > li {
+    .sidebar-sub-level-items {
+      &:not(.flyout-list) {
+        display: none;
+      }
+    }
+  }
+
+  .nav-icon-container {
+    margin-right: 0;
+  }
+
+  .toggle-sidebar-button {
+    padding: 16px;
+    width: $contextual-sidebar-collapsed-width - 1px;
+
+    .collapse-text,
+    .icon-angle-double-left {
+      display: none;
+    }
+
+    .icon-angle-double-right {
+      display: block;
+      margin: 0;
+    }
+  }
+}
+
 .nav-sidebar {
   transition: width $sidebar-transition-duration, left $sidebar-transition-duration;
   position: fixed;
@@ -89,7 +127,7 @@
     }
   }
-  &.sidebar-collapsed-desktop {
+  @mixin collapse-contextual-sidebar {
     width: $contextual-sidebar-collapsed-width;
     .nav-sidebar-inner-scroll {
@@ -115,6 +153,10 @@
     }
   }
+  &.sidebar-collapsed-desktop {
+    @include collapse-contextual-sidebar;
+  }
+
   &.sidebar-expanded-mobile {
     left: 0;
   }
@@ -150,7 +192,7 @@
     }
   }
-  @include media-breakpoint-down(xs) {
+  @include media-breakpoint-down(sm) {
     left: (-$contextual-sidebar-width);
   }
@@ -167,16 +209,19 @@
     height: 16px;
     width: 16px;
   }
+
+  @media (min-width: map-get($grid-breakpoints, md)) and (max-width: map-get($grid-breakpoints, xl) - 1px) {
+    &:not(.sidebar-expanded-mobile) {
+      @include collapse-contextual-sidebar;
+      @include collapse-contextual-sidebar-content;
+    }
+  }
 }
 .nav-sidebar-inner-scroll {
   height: 100%;
   width: 100%;
   overflow: auto;
-
-  @include media-breakpoint-up(sm) {
-    overflow: hidden;
-  }
 }
 .with-performance-bar .nav-sidebar {
@@ -346,53 +391,13 @@
   }
 }
-.toggle-sidebar-button {
-  @include media-breakpoint-down(xs) {
-    display: none;
-  }
-}
-
 .collapse-text {
   white-space: nowrap;
   overflow: hidden;
 }
 .sidebar-collapsed-desktop {
-  .context-header {
-    height: 60px;
-    width: $contextual-sidebar-collapsed-width;
-
-    a {
-      padding: 10px 4px;
-    }
-  }
-
-  .sidebar-top-level-items > li {
-    .sidebar-sub-level-items {
-      &:not(.flyout-list) {
-        display: none;
-      }
-    }
-  }
-
-  .nav-icon-container {
-    margin-right: 0;
-  }
-
-  .toggle-sidebar-button {
-    padding: 16px;
-    width: $contextual-sidebar-collapsed-width - 1px;
-
-    .collapse-text,
-    .icon-angle-double-left {
-      display: none;
-    }
-
-    .icon-angle-double-right {
-      display: block;
-      margin: 0;
-    }
-  }
+  @include collapse-contextual-sidebar-content;
 }
 .fly-out-top-item {
@@ -428,16 +433,14 @@
     color: $gl-text-color-secondary;
   }
-  @include media-breakpoint-down(xs) {
+  @include media-breakpoint-down(sm) {
     display: flex;
     align-items: center;
     i {
       font-size: 18px;
     }
-  }
-  @include media-breakpoint-down(xs) {
     + .breadcrumbs-links {
       padding-left: $gl-padding;
       border-left: 1px solid $gl-text-color-quaternary;
@@ -445,21 +448,25 @@
   }
 }
-@include media-breakpoint-down(xs) {
+@include media-breakpoint-down(sm) {
   .close-nav-button {
     display: flex;
   }
-}
-.mobile-overlay {
-  display: none;
-  &.mobile-nav-open {
-    display: block;
-    position: fixed;
-    background-color: $black-transparent;
-    height: 100%;
-    width: 100%;
-    z-index: 300;
+  .toggle-sidebar-button {
+    display: none;
+  }
+  .mobile-overlay {
+    display: none;
+
+    &.mobile-nav-open {
+      display: block;
+      position: fixed;
+      background-color: $black-transparent;
+      height: 100%;
+      width: 100%;
+      z-index: 300;
+    }
   }
 }

app/assets/stylesheets/framework/modal.scss

@@ -52,14 +52,16 @@
   display: flex;
   flex-direction: row;
-  .btn + .btn {
+  .btn + .btn:not(.dropdown-toggle-split),
+  .btn + .btn-group {
     margin-left: $grid-size;
   }
   @include media-breakpoint-down(xs) {
     flex-direction: column;
-    .btn + .btn {
+    .btn + .btn:not(.dropdown-toggle-split),
+    .btn + .btn-group {
       margin-left: 0;
       margin-top: $grid-size;
     }

app/assets/stylesheets/framework/sidebar.scss

@@ -157,3 +157,55 @@
 .sidebar-collapsed-icon .sidebar-collapsed-value {
   font-size: 12px;
 }
+
+.ancestor-tree {
+  .vertical-timeline {
+    position: relative;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+
+    &::before {
+      content: '';
+      border-left: 1px solid $gray-500;
+      position: absolute;
+      top: $gl-padding;
+      bottom: $gl-padding;
+      left: map-get($spacers, 2) - 1px;
+    }
+
+    &-row {
+      margin-top: map-get($spacers, 3);
+
+      &:nth-child(1) {
+        margin-top: 0;
+      }
+    }
+
+    &-icon {
+      /**
+      * 2px extra is to give a little more height than needed
+      * to hide timeline line before/after the element starts/ends
+      */
+      height: map-get($spacers, 4) + 2px;
+      z-index: 1;
+      position: relative;
+      top: -3px;
+      padding: $gl-padding-4 0;
+      background-color: $gray-light;
+
+      &.opened {
+        color: $green-500;
+      }
+
+      &.closed {
+        color: $blue-500;
+      }
+    }
+
+    &-content {
+      line-height: initial;
+      margin-left: $gl-padding-8;
+    }
+  }
+}

app/assets/stylesheets/framework/tables.scss

@@ -161,4 +161,3 @@ table {
     border-top: 0;
   }
 }
-

app/assets/stylesheets/framework/variables.scss

@@ -343,6 +343,7 @@ $regular-font: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-San
 $dropdown-width: 300px;
 $dropdown-min-height: 40px;
 $dropdown-max-height: 312px;
+$dropdown-max-height-lg: 445px;
 $dropdown-vertical-offset: 4px;
 $dropdown-empty-row-bg: rgba(#000, 0.04);
 $dropdown-shadow-color: rgba(#000, 0.1);

app/assets/stylesheets/pages/diff.scss

@@ -53,6 +53,10 @@
       background-color: $gray-normal;
     }
+    a {
+      color: $gray-700;
+    }
+
     svg {
       vertical-align: middle;
       top: -1px;

app/assets/stylesheets/pages/pipelines.scss

@@ -341,13 +341,15 @@
   &.builds .ci-table tr {
     height: 71px;
   }
-}
-.build-failures {
-  th {
-    border-top: 0;
+  .ci-table {
+    thead th {
+      border-top: 0;
+    }
   }
+}
+.build-failures {
   .build-state {
     padding: 20px 2px;

app/assets/stylesheets/pages/settings.scss

@@ -316,8 +316,4 @@
 .push-pull-table {
   margin-top: 1em;
-
-  .mirror-action-buttons {
-    padding-right: 0;
-  }
 }

app/controllers/clusters/applications_controller.rb

@@ -3,26 +3,41 @@
 class Clusters::ApplicationsController < Clusters::BaseController
   before_action :cluster
   before_action :authorize_create_cluster!, only: [:create]
+  before_action :authorize_update_cluster!, only: [:update]
   def create
-    Clusters::Applications::CreateService
-      .new(@cluster, current_user, create_cluster_application_params)
-      .execute(request)
+    request_handler do
+      Clusters::Applications::CreateService
+        .new(@cluster, current_user, cluster_application_params)
+        .execute(request)
+    end
+  end
+
+  def update
+    request_handler do
+      Clusters::Applications::UpdateService
+        .new(@cluster, current_user, cluster_application_params)
+        .execute(request)
+    end
+  end
+
+  private
+
+  def request_handler
+    yield
     head :no_content
-  rescue Clusters::Applications::CreateService::InvalidApplicationError
+  rescue Clusters::Applications::BaseService::InvalidApplicationError
     render_404
   rescue StandardError
     head :bad_request
   end
-  private
-
   def cluster
     @cluster ||= clusterable.clusters.find(params[:id]) || render_404
   end
-  def create_cluster_application_params
+  def cluster_application_params
     params.permit(:application, :hostname, :email)
   end
 end

app/controllers/concerns/continue_params.rb

@@ -6,7 +6,7 @@ module ContinueParams
   def continue_params
     continue_params = params[:continue]
-    return nil unless continue_params
+    return unless continue_params
     continue_params = continue_params.permit(:to, :notice, :notice_now)
     continue_params[:to] = safe_redirect_path(continue_params[:to])

app/controllers/concerns/issuable_actions.rb

@@ -8,7 +8,7 @@ module IssuableActions
     before_action :authorize_destroy_issuable!, only: :destroy
     before_action :authorize_admin_issuable!, only: :bulk_update
     before_action only: :show do
-      push_frontend_feature_flag(:reply_to_individual_notes)
+      push_frontend_feature_flag(:reply_to_individual_notes, default_enabled: true)
     end
   end

app/controllers/concerns/renders_notes.rb

@@ -16,7 +16,7 @@ module RendersNotes
   private
   def preload_max_access_for_authors(notes, project)
-    return nil unless project
+    return unless project
     user_ids = notes.map(&:author_id)
     project.team.max_member_access_for_user_ids(user_ids)

app/controllers/graphql_controller.rb

@@ -3,9 +3,16 @@
 class GraphqlController < ApplicationController
   # Unauthenticated users have access to the API for public data
   skip_before_action :authenticate_user!
-  prepend_before_action(only: [:execute]) { authenticate_sessionless_user!(:api) }
+
+  # Allow missing CSRF tokens, this would mean that if a CSRF is invalid or missing,
+  # the user won't be authenticated but can proceed as an anonymous user.
+  #
+  # If a CSRF is valid, the user is authenticated. This makes it easier to play
+  # around in GraphiQL.
+  protect_from_forgery with: :null_session, only: :execute
   before_action :check_graphql_feature_flag!
+  before_action(only: [:execute]) { authenticate_sessionless_user!(:api) }
   def execute
     variables = Gitlab::Graphql::Variables.new(params[:variables]).to_h