Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-21

# Conflicts:
#	app/assets/javascripts/environments/components/environment_item.vue
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/monitoring/components/graph/flag.vue
#	app/assets/javascripts/notes/components/note_form.vue
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue
#	app/views/repository_check_mailer/notify.html.haml
#	app/views/repository_check_mailer/notify.text.haml

[ci skip]

app/assets/javascripts/environments/components/environment_item.vue

@@ -471,6 +471,7 @@ export default {
       <div v-if="!model.isFolder" class="table-mobile-header" role="rowheader">
         {{ s__('Environments|Environment') }}
       </div>
+<<<<<<< HEAD
 
       <span v-if="model.hasDeployBoard" class="deploy-board-icon" @click="toggleDeployBoard">
         <icon :name="deployIconName" />
@@ -489,6 +490,18 @@ export default {
 
         <span> {{ model.folderName }} </span>
 
+=======
+      <span v-if="!model.isFolder" class="environment-name table-mobile-content">
+        <a class="qa-environment-link" :href="environmentPath"> {{ model.name }} </a>
+      </span>
+      <span v-else class="folder-name" role="button" @click="onClickFolder">
+        <icon :name="folderIconName" class="folder-icon" />
+
+        <icon name="folder" class="folder-icon" />
+
+        <span> {{ model.folderName }} </span>
+
+>>>>>>> upstream/master
         <span class="badge badge-pill"> {{ model.size }} </span>
       </span>
     </div>

app/assets/javascripts/environments/components/environments_table.vue

@@ -71,6 +71,7 @@ export default {
         :can-read-environment="canReadEnvironment"
       />
 
+<<<<<<< HEAD
       <div
         v-if="model.hasDeployBoard && model.isDeployBoardVisible"
         :key="`deploy-board-row-${i}`"
@@ -86,6 +87,8 @@ export default {
         </div>
       </div>
 
+=======
+>>>>>>> upstream/master
       <template v-if="shouldRenderFolderContent(model)">
         <div v-if="model.isLoadingFolderContent" :key="`loading-item-${i}`">
           <gl-loading-icon :size="2" />

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -199,7 +199,11 @@ export default {
 
 <template>
   <div v-if="!showEmptyState" :key="forceRedraw" class="prometheus-graphs prepend-top-default">
+<<<<<<< HEAD
     <div v-if="showEnvironmentDropdown" class="environments d-flex align-items-center">
+=======
+    <div class="environments d-flex align-items-center">
+>>>>>>> upstream/master
       {{ s__('Metrics|Environment') }}
       <div class="dropdown prepend-left-10">
         <button class="dropdown-menu-toggle" data-toggle="dropdown" type="button">

app/assets/javascripts/monitoring/components/graph/flag.vue

@@ -121,11 +121,19 @@ export default {
     <div v-if="showFlagContent" :class="flagOrientation" class="prometheus-graph-flag popover">
       <div class="arrow-shadow"></div>
       <div class="arrow"></div>
+<<<<<<< HEAD
       <div class="popover-header">
         <h5 v-if="deploymentFlagData">Deployed</h5>
         {{ formatDate }} <strong>{{ formatTime }}</strong>
       </div>
       <div v-if="deploymentFlagData" class="popover-body deploy-meta-content">
+=======
+      <div class="popover-title">
+        <h5 v-if="deploymentFlagData">Deployed</h5>
+        {{ formatDate }} <strong>{{ formatTime }}</strong>
+      </div>
+      <div v-if="deploymentFlagData" class="popover-content deploy-meta-content">
+>>>>>>> upstream/master
         <div>
           <icon :size="12" name="commit" />
           <a :href="deploymentFlagData.commitUrl"> {{ deploymentFlagData.sha.slice(0, 8) }} </a>

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

@@ -190,6 +190,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
         </textarea>
       </markdown-field>
       <div class="note-form-actions clearfix">
+<<<<<<< HEAD
         <template v-if="showBatchCommentsActions">
           <p v-if="discussion && discussion.id">
             <label>
@@ -262,6 +263,30 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
             Cancel
           </button>
         </template>
+=======
+        <button
+          :disabled="isDisabled"
+          type="button"
+          class="js-vue-issue-save btn btn-success js-comment-button "
+          @click="handleUpdate();"
+        >
+          {{ saveButtonTitle }}
+        </button>
+        <button
+          v-if="discussion.resolvable"
+          class="btn btn-nr btn-default append-right-10 js-comment-resolve-button"
+          @click.prevent="handleUpdate(true);"
+        >
+          {{ resolveButtonTitle }}
+        </button>
+        <button
+          class="btn btn-cancel note-edit-cancel js-close-discussion-note-form"
+          type="button"
+          @click="cancelHandler();"
+        >
+          Cancel
+        </button>
+>>>>>>> upstream/master
       </div>
     </form>
   </div>

app/assets/javascripts/pipelines/components/graph/graph_component.vue

@@ -74,6 +74,7 @@ export default {
   <div class="build-content middle-block js-pipeline-graph">
     <div class="pipeline-visualization pipeline-graph pipeline-tab-content">
       <div class="text-center"><gl-loading-icon v-if="isLoading" :size="3" /></div>
+<<<<<<< HEAD
 
       <linked-pipelines-column
         v-if="hasTriggeredBy"
@@ -89,6 +90,10 @@ export default {
         }"
         class="stage-column-list"
       >
+=======
+
+      <ul v-if="!isLoading" class="stage-column-list">
+>>>>>>> upstream/master
         <stage-column-component
           v-for="(stage, index) in graph"
           :key="stage.name"

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

@@ -139,6 +139,7 @@ export default {
           </div>
           <div>
             <span class="mr-widget-pipeline-graph">
+<<<<<<< HEAD
               <span class="stage-cell">
                 <linked-pipelines-mini-list v-if="triggeredBy.length" :triggered-by="triggeredBy" />
                 <template v-if="hasStages">
@@ -155,6 +156,16 @@ export default {
                     <pipeline-stage :stage="stage" />
                   </div>
                 </template>
+=======
+              <span v-if="hasStages" class="stage-cell">
+                <div
+                  v-for="(stage, i) in pipeline.details.stages"
+                  :key="i"
+                  class="stage-container dropdown js-mini-pipeline-graph mr-widget-pipeline-stages"
+                >
+                  <pipeline-stage :stage="stage" />
+                </div>
+>>>>>>> upstream/master
               </span>
 
               <linked-pipelines-mini-list v-if="triggered.length" :triggered="triggered" />

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

@@ -97,6 +97,12 @@ export default {
 
 <template>
   <div :class="blockClass" class="block">
+<<<<<<< HEAD
+=======
+    <div class="issuable-sidebar-header">
+      <toggle-sidebar :collapsed="collapsed" @toggle="toggleSidebar" />
+    </div>
+>>>>>>> upstream/master
     <collapsed-calendar-icon :text="collapsedText" class="sidebar-collapsed-icon" />
     <div class="title">
       {{ label }}
@@ -130,7 +136,11 @@ export default {
             -
             <button
               type="button"
+<<<<<<< HEAD
               class="btn-blank btn-link btn-default-hover-link"
+=======
+              class="btn-blank btn-link btn-secondary-hover-link"
+>>>>>>> upstream/master
               @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;

app/views/repository_check_mailer/notify.html.haml

@@ -6,6 +6,7 @@
 
 %p
   = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url }
+<<<<<<< HEAD
 
 -# EE-specific start
 - if Gitlab::CurrentSettings.email_additional_text.present?
@@ -15,3 +16,5 @@
     %br
       = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
 -# EE-specific end
+=======
+>>>>>>> upstream/master

app/views/repository_check_mailer/notify.text.haml

@@ -3,6 +3,7 @@
 = _("View details: %{details_url}") % { details_url: admin_projects_url(last_repository_check_failed: 1) }
 
 = _("You are receiving this message because you are a GitLab administrator for %{url}.") % { url: Gitlab.config.gitlab.url }
+<<<<<<< HEAD
 
 -# EE-specific start
 - if Gitlab::CurrentSettings.email_additional_text.present?
@@ -10,3 +11,5 @@
   = '---'
   = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.email_additional_text)
 -# EE-specific end
+=======
+>>>>>>> upstream/master

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/administration/pages/index.md

@@ -244,8 +244,9 @@ This setting is enabled by default.
 
 ### Access control
 
-Access control was [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33422)
-in GitLab 11.5. It can be configured per-project, and allows access to a Pages
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33422) in GitLab 11.5.
+
+GitLab Pages access control can be configured per-project, and allows access to a Pages
 site to be controlled based on a user's membership to that project.
 
 Access control works by registering the Pages daemon as an OAuth application
@@ -259,15 +260,16 @@ Each request to view a resource in a private site is authenticated by Pages
 using that token. For each request it receives, it makes a request to the GitLab
 API to check that the user is authorized to read that site.
 
-Pages access control is currently disabled by default. To enable it, you must:
+Pages access control is disabled by default. To enable it:
 
-1. Enable it in `/etc/gitlab/gitlab.rb`
+1. Enable it in `/etc/gitlab/gitlab.rb`:
 
     ```ruby
     gitlab_pages['access_control'] = true
     ```
 
-1. [Reconfigure GitLab][reconfigure]
+1. [Reconfigure GitLab][reconfigure].
+1. Users can now configure it in their [projects' settings](../../user/project/pages/introduction.md#gitlab-pages-access-control-core-only).
 
 ## Activate verbose logging for daemon
 

doc/administration/pages/source.md

@@ -393,8 +393,9 @@ server_name ~^.*\.pages\.example\.io$;
 
 ## Access control
 
-Access control was [introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33422)
-in GitLab 11.5. It can be configured per-project, and allows access to a Pages
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33422) in GitLab 11.5.
+
+GitLab Pages access control can be configured per-project, and allows access to a Pages
 site to be controlled based on a user's membership to that project.
 
 Access control works by registering the Pages daemon as an OAuth application
@@ -408,15 +409,17 @@ Each request to view a resource in a private site is authenticated by Pages
 using that token. For each request it receives, it makes a request to the GitLab
 API to check that the user is authorized to read that site.
 
-Pages access control is currently disabled by default. To enable it, you must:
+Pages access control is disabled by default. To enable it:
 
 1. Modify your `config/gitlab.yml` file:
+
     ```yaml
     pages:
       access_control: true
     ```
-1. [Restart GitLab][restart]
-1. Create a new [system OAuth application](../../integration/oauth_provider.md#adding-an-application-through-the-profile)
+
+1. [Restart GitLab][restart].
+1. Create a new [system OAuth application](../../integration/oauth_provider.md#adding-an-application-through-the-profile).
    This should be called `GitLab Pages` and have a `Redirect URL` of
    `https://projects.example.io/auth`. It does not need to be a "trusted"
    application, but it does need the "api" scope.
@@ -429,6 +432,8 @@ Pages access control is currently disabled by default. To enable it, you must:
       -auth-server <URL of the GitLab instance>
     ```
 
+1. Users can now configure it in their [projects' settings](../../user/project/pages/introduction.md#gitlab-pages-access-control-core-only).
+
 ## Change storage path
 
 Follow the steps below to change the default path where GitLab Pages' contents

doc/user/permissions.md

@@ -94,7 +94,7 @@ The following table depicts the various user permission levels in a project.
 | Manage GitLab Pages                   |         |            |             | ✓        | ✓      |
 | Manage GitLab Pages domains and certificates |         |            |             | ✓        | ✓      |
 | Remove GitLab Pages                   |         |            |             |          | ✓      |
-| View GitLab Pages protected by [access control](../administration/pages/index.md#access-control) | ✓       | ✓          | ✓           | ✓        | ✓      |
+| View GitLab Pages protected by [access control](project/pages/introduction.md#gitlab-pages-access-control-core-only) | ✓       | ✓          | ✓           | ✓        | ✓      |
 | Manage clusters                       |         |            |             | ✓        | ✓      |
 | Manage license policy **[ULTIMATE]**  |         |            |             | ✓        | ✓      |
 | Edit comments (posted by any user)    |         |            |             | ✓        | ✓      |

doc/user/project/pages/introduction.md

@@ -441,6 +441,46 @@ The rest of the guide still applies.
 
 See also: [GitLab Pages from A to Z: Part 1 - Static sites and GitLab Pages domains](getting_started_part_one.md#gitlab-pages-domain).
 
+## GitLab Pages access control **[CORE ONLY]**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33422) in GitLab 11.5.
+
+NOTE: **Note:**
+GitLab Pages access control is not activated on GitLab.com.
+
+You can enable Pages access control on your project, so that only
+[members of your project](../../permissions.md#project-members-permissions)
+(at least Guest) can access your website:
+
+1. Navigate to your project's **Settings > General > Permissions**.
+1. Toggle the **Pages** button to enable the access control.
+
+    NOTE: **Note:**
+    If you don't see the toggle button, that means that it's not enabled.
+    Ask your administrator to [enable it](../../../administration/pages/index.md#access-control).
+
+1. The Pages access control dropdown allows you to set who can view pages hosted
+   with GitLab Pages, depending on your project's visibility:
+
+    - If your project is private:
+      - **Only project members**: Only project members will be able to browse the website.
+      - **Everyone**: Everyone, both logged into and logged out of GitLab, will be able to browse the website, no matter their project membership.
+    - If your project is internal:
+      - **Only project members**: Only project members will be able to browse the website.
+      - **Everyone with access**: Everyone logged into GitLab will be able to browse the website, no matter their project membership.
+      - **Everyone**: Everyone, both logged into and logged out of GitLab, will be able to browse the website, no matter their project membership.
+    - If your project is public:
+      - **Only project members**: Only project members will be able to browse the website.
+      - **Everyone with access**: Everyone, both logged into and logged out of GitLab, will be able to browse the website, no matter their project membership.
+
+1. Click **Save changes**.
+
+---
+
+The next time someone tries to access your website and the access control is
+enabled, they will be presented with a page to sign into GitLab and verify they
+can access the website.
+
 ## Limitations
 
 When using Pages under the general domain of a GitLab instance (`*.example.io`),

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

locale/gitlab.pot

@@ -8974,6 +8974,9 @@ msgstr ""
 msgid "View epics list"
 msgstr ""
 
+msgid "View details: %{details_url}"
+msgstr ""
+
 msgid "View file @ "
 msgstr ""