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

CE upstream - 2018-11-21 02:21 UTC

Closes gitlab-ce#53571

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

app/assets/javascripts/notes/components/note_form.vue

@@ -242,7 +242,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
           <button
             :disabled="isDisabled"
             type="button"
-            class="js-vue-issue-save btn btn-success js-comment-button"
+            class="js-vue-issue-save btn btn-success js-comment-button "
             @click="handleUpdate();"
           >
             {{ saveButtonTitle }}

app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue

@@ -97,6 +97,9 @@ export default {
 
 <template>
   <div :class="blockClass" class="block">
+    <div class="issuable-sidebar-header">
+      <toggle-sidebar :collapsed="collapsed" @toggle="toggleSidebar" />
+    </div>
     <collapsed-calendar-icon :text="collapsedText" class="sidebar-collapsed-icon" />
     <div class="title">
       {{ label }}
@@ -130,7 +133,7 @@ export default {
             -
             <button
               type="button"
-              class="btn-blank btn-link btn-default-hover-link"
+              class="btn-blank btn-link btn-secondary-hover-link"
               @click="newDateSelected(null);"
             >
               remove

app/assets/stylesheets/framework/issue_box.scss

@@ -22,7 +22,7 @@
   margin-right: 10px;
   color: $white-light;
   font-size: $gl-font-size;
-  line-height: 25px;
+  line-height: $gl-line-height-24;
 
   &.status-box-closed,
   &.status-box-mr-closed {

app/assets/stylesheets/framework/variables.scss

@@ -272,6 +272,7 @@ $context-header-height: 60px;
 $breadcrumb-min-height: 48px;
 $project-title-row-height: 24px;
 $gl-line-height: 16px;
+$gl-line-height-24: 24px;
 
 // EE-only CSS variables START
 $system-header-height: 35px;

app/assets/stylesheets/pages/issuable.scss

@@ -6,19 +6,16 @@
 .issuable-warning-icon {
   background-color: $orange-100;
   border-radius: $border-radius-default;
-  margin: 0 $btn-side-margin 0 0;
   width: $issuable-warning-size;
   height: $issuable-warning-size;
   text-align: center;
+  margin-right: $issuable-warning-icon-margin;
+  line-height: $gl-line-height-24;
 
   .icon {
     fill: $orange-600;
     vertical-align: text-bottom;
   }
-
-  &:first-of-type {
-    margin-right: $issuable-warning-icon-margin;
-  }
 }
 
 .limit-container-width {
@@ -701,7 +698,6 @@
   flex: 1;
   display: inline-block;
   font-size: 14px;
-  line-height: 24px;
   align-self: center;
   overflow: hidden;
   text-overflow: ellipsis;

changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml

+---
+title: Align issue status label and confidential icon.
+merge_request: 23046
+author: George Tsiolis
+type: fixed

doc/user/project/web_ide/index.md

@@ -22,6 +22,27 @@ searching. The file finder is launched using the keyboard shortcut `Command-p`,
 `Control-p`, or `t` (when editor is not in focus). Type the filename or
 file path fragments to start seeing results.
 
+## Syntax highligting
+
+As expected from an IDE, syntax highlighting for many languages within 
+the Web IDE will make your direct editing even easier.
+
+The Web IDE currently provides:
+
+- Basic syntax colorization for a variety of programming, scripting and markup 
+languages such as XML, PHP, C#, C++, Markdown, Java, VB, Batch, Python, Ruby 
+and Objective-C.  
+- IntelliSense and validation support (displaying errors and warnings, providing 
+smart completions, formatting, and outlining) for some languages. For example: 
+TypeScript, JavaScript, CSS, LESS, SCSS, JSON and HTML. 
+
+Because the Web IDE is based on the [Monaco Editor](https://microsoft.github.io/monaco-editor/), 
+you can find a more complete list of supported languages in the 
+[Monaco languages](https://github.com/Microsoft/monaco-languages) repository.  
+
+NOTE: **Note:**
+Single file editing is based on the [Ace Editor](https://ace.c9.io).
+
 ## Stage and commit changes
 
 After making your changes, click the Commit button in the bottom left to