Merge branch 'master' into jivl-update-katex

app/assets/javascripts/sidebar/components/time_tracking/time_tracker.js → app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue

+<script>
 import timeTrackingHelpState from './help_state';
 import timeTrackingCollapsedState from './collapsed_state';
 import timeTrackingSpentOnlyPane from './spent_only_pane';
@@ -8,7 +9,15 @@ import timeTrackingComparisonPane from './comparison_pane';
 import eventHub from '../../event_hub';
 export default {
-  name: 'issuable-time-tracker',
+  name: 'IssuableTimeTracker',
+  components: {
+    'time-tracking-collapsed-state': timeTrackingCollapsedState,
+    'time-tracking-estimate-only-pane': timeTrackingEstimateOnlyPane,
+    'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
+    'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane,
+    'time-tracking-comparison-pane': timeTrackingComparisonPane,
+    'time-tracking-help-state': timeTrackingHelpState,
+  },
   props: {
     time_estimate: {
       type: Number,
@@ -38,14 +47,6 @@ export default {
       showHelp: false,
     };
   },
-  components: {
-    'time-tracking-collapsed-state': timeTrackingCollapsedState,
-    'time-tracking-estimate-only-pane': timeTrackingEstimateOnlyPane,
-    'time-tracking-spent-only-pane': timeTrackingSpentOnlyPane,
-    'time-tracking-no-tracking-pane': timeTrackingNoTrackingPane,
-    'time-tracking-comparison-pane': timeTrackingComparisonPane,
-    'time-tracking-help-state': timeTrackingHelpState,
-  },
   computed: {
     timeSpent() {
       return this.time_spent;
@@ -81,6 +82,9 @@ export default {
       return !!this.showHelp;
     },
   },
+  created() {
+    eventHub.$on('timeTracker:updateData', this.update);
+  },
   methods: {
     toggleHelpState(show) {
       this.showHelp = show;
@@ -92,72 +96,73 @@ export default {
       this.human_time_spent = data.human_time_spent;
     },
   },
-  created() {
-    eventHub.$on('timeTracker:updateData', this.update);
-  },
-  template: `
-    <div
-      class="time_tracker time-tracking-component-wrap"
-      v-cloak
-    >
-      <time-tracking-collapsed-state
-        :show-comparison-state="showComparisonState"
-        :show-no-time-tracking-state="showNoTimeTrackingState"
-        :show-help-state="showHelpState"
-        :show-spent-only-state="showSpentOnlyState"
-        :show-estimate-only-state="showEstimateOnlyState"
+};
+</script>
+
+<template>
+  <div
+    class="time_tracker time-tracking-component-wrap"
+    v-cloak
+  >
+    <time-tracking-collapsed-state
+      :show-comparison-state="showComparisonState"
+      :show-no-time-tracking-state="showNoTimeTrackingState"
+      :show-help-state="showHelpState"
+      :show-spent-only-state="showSpentOnlyState"
+      :show-estimate-only-state="showEstimateOnlyState"
+      :time-spent-human-readable="timeSpentHumanReadable"
+      :time-estimate-human-readable="timeEstimateHumanReadable"
+    />
+    <div class="title hide-collapsed">
+      {{ __('Time tracking') }}
+      <div
+        class="help-button pull-right"
+        v-if="!showHelpState"
+        @click="toggleHelpState(true)"
+      >
+        <i
+          class="fa fa-question-circle"
+          aria-hidden="true"
+        >
+        </i>
+      </div>
+      <div
+        class="close-help-button pull-right"
+        v-if="showHelpState"
+        @click="toggleHelpState(false)"
+      >
+        <i
+          class="fa fa-close"
+          aria-hidden="true"
+        >
+        </i>
+      </div>
+    </div>
+    <div class="time-tracking-content hide-collapsed">
+      <time-tracking-estimate-only-pane
+        v-if="showEstimateOnlyState"
+        :time-estimate-human-readable="timeEstimateHumanReadable"
+      />
+      <time-tracking-spent-only-pane
+        v-if="showSpentOnlyState"
+        :time-spent-human-readable="timeSpentHumanReadable"
+      />
+      <time-tracking-no-tracking-pane
+        v-if="showNoTimeTrackingState"
+      />
+      <time-tracking-comparison-pane
+        v-if="showComparisonState"
+        :time-estimate="timeEstimate"
+        :time-spent="timeSpent"
         :time-spent-human-readable="timeSpentHumanReadable"
         :time-estimate-human-readable="timeEstimateHumanReadable"
       />
-      <div class="title hide-collapsed">
-        Time tracking
-        <div
-          class="help-button pull-right"
-          v-if="!showHelpState"
-          @click="toggleHelpState(true)"
-        >
-            <i
-              class="fa fa-question-circle"
-              aria-hidden="true"
-            />
-        </div>
-        <div
-          class="close-help-button pull-right"
+      <transition name="help-state-toggle">
+        <time-tracking-help-state
           v-if="showHelpState"
-          @click="toggleHelpState(false)"
-        >
-          <i
-            class="fa fa-close"
-            aria-hidden="true"
-          />
-        </div>
-      </div>
-      <div class="time-tracking-content hide-collapsed">
-        <time-tracking-estimate-only-pane
-          v-if="showEstimateOnlyState"
-          :time-estimate-human-readable="timeEstimateHumanReadable"
+          :root-path="rootPath"
         />
-        <time-tracking-spent-only-pane
-          v-if="showSpentOnlyState"
-          :time-spent-human-readable="timeSpentHumanReadable"
-        />
-        <time-tracking-no-tracking-pane
-          v-if="showNoTimeTrackingState"
-        />
-        <time-tracking-comparison-pane
-          v-if="showComparisonState"
-          :time-estimate="timeEstimate"
-          :time-spent="timeSpent"
-          :time-spent-human-readable="timeSpentHumanReadable"
-          :time-estimate-human-readable="timeEstimateHumanReadable"
-        />
-        <transition name="help-state-toggle">
-          <time-tracking-help-state
-            v-if="showHelpState"
-            :rootPath="rootPath"
-          />
-        </transition>
-      </div>
+      </transition>
     </div>
-  `,
-};
+  </div>
+</template>

app/assets/javascripts/toggle_buttons.js

@@ -8,7 +8,7 @@ import { convertPermissionToBoolean } from './lib/utils/common_utils';
  ```
   %button.js-project-feature-toggle.project-feature-toggle{ type: "button",
     class: "#{'is-checked' if enabled?}",
-    'aria-label': _('Toggle Cluster') }
+    'aria-label': _('Toggle Kubernetes Cluster') }
     %input{ type: "hidden", class: 'js-project-feature-toggle-input', value: enabled? }
   ```
 */

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js

-import statusIcon from '../mr_widget_status_icon.vue';
-import tooltip from '../../../vue_shared/directives/tooltip';
-import mrWidgetMergeHelp from '../../components/mr_widget_merge_help.vue';
-
-export default {
-  name: 'MRWidgetMissingBranch',
-  props: {
-    mr: { type: Object, required: true },
-  },
-  directives: {
-    tooltip,
-  },
-  components: {
-    'mr-widget-merge-help': mrWidgetMergeHelp,
-    statusIcon,
-  },
-  computed: {
-    missingBranchName() {
-      return this.mr.sourceBranchRemoved ? 'source' : 'target';
-    },
-    message() {
-      return `If the ${this.missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line`;
-    },
-  },
-  template: `
-    <div class="mr-widget-body media">
-      <status-icon status="warning" :show-disabled-button="true" />
-      <div class="media-body space-children">
-        <span class="bold js-branch-text">
-          <span class="capitalize">
-            {{missingBranchName}}
-          </span> branch does not exist.
-          Please restore it or use a different {{missingBranchName}} branch
-          <i
-            v-tooltip
-            class="fa fa-question-circle"
-            :title="message"
-            :aria-label="message"></i>
-        </span>
-      </div>
-    </div>
-  `,
-};

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

+<script>
+  import { sprintf, s__ } from '~/locale';
+  import tooltip from '~/vue_shared/directives/tooltip';
+  import statusIcon from '../mr_widget_status_icon.vue';
+  import mrWidgetMergeHelp from '../../components/mr_widget_merge_help.vue';
+
+  export default {
+    name: 'MRWidgetMissingBranch',
+    directives: {
+      tooltip,
+    },
+    components: {
+      mrWidgetMergeHelp,
+      statusIcon,
+    },
+    props: {
+      mr: {
+        type: Object,
+        required: true,
+      },
+    },
+    computed: {
+      missingBranchName() {
+        return this.mr.sourceBranchRemoved ? 'source' : 'target';
+      },
+      missingBranchNameMessage() {
+        return sprintf(s__('mrWidget| Please restore it or use a different %{missingBranchName} branch'), {
+          missingBranchName: this.missingBranchName,
+        });
+      },
+      message() {
+        return sprintf(s__('mrWidget|If the %{missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line'), {
+          missingBranchName: this.missingBranchName,
+        });
+      },
+    },
+  };
+</script>
+<template>
+  <div class="mr-widget-body media">
+    <status-icon
+      status="warning"
+      :show-disabled-button="true"
+    />
+
+    <div class="media-body space-children">
+      <span class="bold js-branch-text">
+        <span class="capitalize">
+          {{ missingBranchName }}
+        </span> {{ s__("mrWidget|branch does not exist.") }}
+        {{ missingBranchNameMessage }}
+        <i
+          v-tooltip
+          class="fa fa-question-circle"
+          :title="message"
+          :aria-label="message"
+        >
+        </i>
+      </span>
+    </div>
+  </div>
+</template>

app/assets/javascripts/vue_merge_request_widget/dependencies.js

@@ -24,7 +24,7 @@ export { default as WipState } from './components/states/mr_widget_wip';
 export { default as ArchivedState } from './components/states/mr_widget_archived.vue';
 export { default as ConflictsState } from './components/states/mr_widget_conflicts.vue';
 export { default as NothingToMergeState } from './components/states/mr_widget_nothing_to_merge';
-export { default as MissingBranchState } from './components/states/mr_widget_missing_branch';
+export { default as MissingBranchState } from './components/states/mr_widget_missing_branch.vue';
 export { default as NotAllowedState } from './components/states/mr_widget_not_allowed';
 export { default as ReadyToMergeState } from './components/states/mr_widget_ready_to_merge';
 export { default as SHAMismatchState } from './components/states/mr_widget_sha_mismatch';

app/assets/javascripts/vue_shared/components/commit.vue

@@ -118,7 +118,7 @@
 <template>
   <div class="branch-commit">
     <template v-if="hasCommitRef && showBranch">
-      <div class="icon-container hidden-xs">
+      <div class="icon-container">
         <i
           v-if="tag"
           class="fa fa-tag"
@@ -132,7 +132,7 @@
       </div>
       <a
-        class="ref-name hidden-xs"
+        class="ref-name"
         :href="commitRef.ref_url"
         v-tooltip
         data-container="body"

app/assets/javascripts/vue_shared/components/confirmation_input.vue

-<script>
-  import _ from 'underscore';
-  import { __, sprintf } from '~/locale';
-
-  export default {
-    props: {
-      inputId: {
-        type: String,
-        required: true,
-      },
-      confirmationKey: {
-        type: String,
-        required: true,
-      },
-      confirmationValue: {
-        type: String,
-        required: true,
-      },
-      shouldEscapeConfirmationValue: {
-        type: Boolean,
-        required: false,
-        default: true,
-      },
-    },
-    computed: {
-      inputLabel() {
-        let value = this.confirmationValue;
-        if (this.shouldEscapeConfirmationValue) {
-          value = _.escape(value);
-        }
-
-        return sprintf(
-          __('Type %{value} to confirm:'),
-          { value: `<code>${value}</code>` },
-          false,
-        );
-      },
-    },
-    methods: {
-      hasCorrectValue() {
-        return this.$refs.enteredValue.value === this.confirmationValue;
-      },
-    },
-  };
-</script>
-
-<template>
-  <div>
-    <label
-      v-html="inputLabel"
-      :for="inputId"
-    >
-    </label>
-    <input
-      :id="inputId"
-      :name="confirmationKey"
-      type="text"
-      ref="enteredValue"
-      class="form-control"
-    />
-  </div>
-</template>

app/assets/javascripts/vue_shared/components/modal.vue

@@ -46,6 +46,11 @@
         required: false,
         default: '',
       },
+      secondaryButtonLabel: {
+        type: String,
+        required: false,
+        default: '',
+      },
       submitDisabled: {
         type: Boolean,
         required: false,
@@ -129,6 +134,21 @@
             >
               {{ closeButtonLabel }}
             </button>
+
+            <slot
+              v-if="secondaryButtonLabel"
+              name="secondary-button"
+            >
+              <button
+                v-if="secondaryButtonLabel"
+                type="button"
+                class="btn"
+                data-dismiss="modal"
+              >
+                {{ secondaryButtonLabel }}
+              </button>
+            </slot>
+
             <button
               v-if="primaryButtonLabel"
               type="button"

app/assets/stylesheets/framework.scss

@@ -21,7 +21,7 @@
 @import "framework/flash";
 @import "framework/forms";
 @import "framework/gfm";
-@import "framework/gitlab-theme";
+@import "framework/gitlab_theme";
 @import "framework/header";
 @import "framework/highlight";
 @import "framework/issue_box";
@@ -35,10 +35,10 @@
 @import "framework/pagination";
 @import "framework/panels";
 @import "framework/popup";
-@import "framework/secondary-navigation-elements";
+@import "framework/secondary_navigation_elements";
 @import "framework/selects";
 @import "framework/sidebar";
-@import "framework/contextual-sidebar";
+@import "framework/contextual_sidebar";
 @import "framework/tables";
 @import "framework/notes";
 @import "framework/tabs";
@@ -49,15 +49,16 @@
 @import "framework/zen";
 @import "framework/blank";
 @import "framework/wells";
-@import "framework/page-header";
+@import "framework/page_header";
 @import "framework/awards";
 @import "framework/images";
-@import "framework/broadcast-messages";
+@import "framework/broadcast_messages";
 @import "framework/emojis";
-@import "framework/emoji-sprites";
+@import "framework/emoji_sprites";
 @import "framework/icons";
 @import "framework/snippets";
 @import "framework/memory_graph";
 @import "framework/responsive_tables";
-@import "framework/stacked-progress-bar";
+@import "framework/stacked_progress_bar";
 @import "framework/ci_variable_list";
+@import "framework/feature_highlight";

app/assets/stylesheets/framework/ci_variable_list.scss

@@ -8,7 +8,11 @@
 .ci-variable-row {
   display: flex;
-  align-items: flex-end;
+  align-items: flex-start;
+
+  @media (max-width: $screen-xs-max) {
+    align-items: flex-end;
+  }
   &:not(:last-child) {
     margin-bottom: $gl-btn-padding;
@@ -41,6 +45,7 @@
 .ci-variable-row-body {
   display: flex;
+  align-items: flex-start;
   width: 100%;
   @media (max-width: $screen-xs-max) {
@@ -65,6 +70,8 @@
   flex: 0 1 auto;
   display: flex;
   align-items: center;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
 .ci-variable-row-remove-button {
@@ -85,4 +92,8 @@
     outline: none;
     color: $gl-text-color;
   }
+
+  &[disabled] {
+    color: $gl-text-color-disabled;
+  }
 }

app/assets/stylesheets/framework/feature_highlight.scss

+.feature-highlight {
+  position: relative;
+  margin-left: $gl-padding;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+
+  &::before {
+    content: '';
+    display: block;
+    position: absolute;
+    top: 6px;
+    left: 6px;
+    width: 8px;
+    height: 8px;
+    background-color: $blue-500;
+    border-radius: 50%;
+    box-shadow: 0 0 0 rgba($blue-500, 0.4);
+    animation: pulse-highlight 2s infinite;
+  }
+
+  &:hover::before,
+  &.disable-animation::before {
+    animation: none;
+  }
+
+  &[disabled]::before {
+    display: none;
+  }
+}
+
+.is-showing-fly-out {
+  .feature-highlight {
+    display: none;
+  }
+}
+
+.feature-highlight-popover-content {
+  display: none;
+
+  hr {
+    margin: $gl-padding * 0.5 0;
+  }
+
+  .btn-link {
+    svg {
+      @include btn-svg;
+
+      path {
+        fill: currentColor;
+      }
+    }
+  }
+
+  .feature-highlight-illustration {
+    width: 100%;
+    height: 100px;
+    padding-top: 12px;
+    padding-bottom: 12px;
+
+    background-color: $indigo-50;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+    border-bottom: 1px solid darken($gray-normal, 8%);
+  }
+}
+
+.popover .feature-highlight-popover-content {
+  display: block;
+}
+
+.feature-highlight-popover {
+  width: 240px;
+  padding: 0;
+  border: 1px solid $dropdown-border-color;
+  box-shadow: 0 2px 4px $dropdown-shadow-color;
+
+  &.right > .arrow {
+    border-right-color: $dropdown-border-color;
+  }
+
+  .popover-content {
+    padding: 0;
+  }
+}
+
+.feature-highlight-popover-sub-content {
+  padding: 9px 14px;
+}
+
+@include keyframes(pulse-highlight) {
+  0% {
+    box-shadow: 0 0 0 0 rgba($blue-200, 0.4);
+  }
+
+  70% {
+    box-shadow: 0 0 0 10px transparent;
+  }
+
+  100% {
+    box-shadow: 0 0 0 0 transparent;
+  }
+}

app/assets/stylesheets/framework/modal.scss

@@ -4,6 +4,11 @@
   .page-title {
     margin-top: 0;
+
+    .color-label {
+      font-size: $gl-font-size;
+      padding: $gl-vert-padding $label-padding-modal;
+    }
   }
 }

app/assets/stylesheets/framework/variables.scss

@@ -214,6 +214,7 @@ $tooltip-font-size: 12px;
  * Padding
  */
 $gl-padding: 16px;
+$gl-padding-8: 8px;
 $gl-col-padding: 15px;
 $gl-btn-padding: 10px;
 $gl-input-padding: 10px;
@@ -558,6 +559,7 @@ $jq-ui-default-color: #777;
 * Label
 */
 $label-padding: 7px;
+$label-padding-modal: 10px;
 $label-gray-bg: #f8fafc;
 $label-inverse-bg: #333;
 $label-remove-border: rgba(0, 0, 0, .1);