Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-09

# Conflicts:
#	db/schema.rb
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

app/assets/javascripts/diffs/components/diff_content.vue

@@ -39,12 +39,12 @@ export default {
     <div class="diff-viewer">
       <template v-if="isTextFile">
         <inline-diff-view
-          v-show="isInlineView"
+          v-if="isInlineView"
           :diff-file="diffFile"
           :diff-lines="diffFile.highlightedDiffLines || []"
         />
         <parallel-diff-view
-          v-show="isParallelView"
+          v-if="isParallelView"
           :diff-file="diffFile"
           :diff-lines="diffFile.parallelDiffLines || []"
         />

app/assets/javascripts/diffs/components/diff_discussions.vue

@@ -15,9 +15,7 @@ export default {
 </script>
 
 <template>
-  <div
-    v-if="discussions.length"
-  >
+  <div>
     <div
       v-for="discussion in discussions"
       :key="discussion.id"

app/assets/javascripts/diffs/components/diff_file.vue

@@ -47,6 +47,9 @@ export default {
         false,
       );
     },
+    showExpandMessage() {
+      return this.isCollapsed && !this.isLoadingCollapsedDiff && !this.file.tooLarge;
+    },
   },
   mounted() {
     document.addEventListener('scroll', this.handleScroll);
@@ -159,7 +162,7 @@ export default {
     </div>
 
     <diff-content
-      v-show="!isCollapsed"
+      v-if="!isCollapsed"
       :class="{ hidden: isCollapsed || file.tooLarge }"
       :diff-file="file"
     />
@@ -168,7 +171,7 @@ export default {
       class="diff-content loading"
     />
     <div
-      v-show="isCollapsed && !isLoadingCollapsedDiff && !file.tooLarge"
+      v-if="showExpandMessage"
       class="nothing-here-block diff-collapsed"
     >
       {{ __('This diff is collapsed.') }}

app/assets/javascripts/diffs/components/diff_file_header.vue

@@ -145,6 +145,7 @@ export default {
         @click.stop="handleToggle"
       />
       <a
+        v-once
         ref="titleWrapper"
         :href="titleLink"
         class="append-right-4"

app/assets/javascripts/diffs/components/diff_line_gutter_content.vue

@@ -189,6 +189,7 @@ export default {
       </button>
       <a
         v-if="lineNumber"
+        v-once
         :data-linenumber="lineNumber"
         :href="lineHref"
       >

app/assets/javascripts/diffs/components/diff_line_note_form.vue

@@ -59,7 +59,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['cancelCommentForm', 'saveNote', 'fetchDiscussions']),
+    ...mapActions(['cancelCommentForm', 'saveNote', 'refetchDiscussionById']),
     handleCancelCommentForm() {
       this.autosave.reset();
       this.cancelCommentForm({
@@ -78,10 +78,10 @@ export default {
       });
 
       this.saveNote(postData)
-        .then(() => {
+        .then(result => {
           const endpoint = this.getNotesDataByProp('discussionsPath');
 
-          this.fetchDiscussions(endpoint)
+          this.refetchDiscussionById({ path: endpoint, discussionId: result.discussion_id })
             .then(() => {
               this.handleCancelCommentForm();
             })

app/assets/javascripts/diffs/components/diff_table_cell.vue

@@ -117,14 +117,6 @@ export default {
 
 <template>
   <td
-    v-if="isContentLine"
-    :class="lineType"
-    class="line_content"
-    v-html="normalizedLine.richText"
-  >
-  </td>
-  <td
-    v-else
     :class="classNameMap"
   >
     <diff-line-gutter-content

app/assets/javascripts/diffs/components/inline_diff_comment_row.vue

@@ -31,22 +31,9 @@ export default {
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),
     ...mapGetters(['discussionsByLineCode']),
-    isDiscussionExpanded() {
-      if (!this.discussions.length) {
-        return false;
-      }
-
-      return this.discussions.every(discussion => discussion.expanded);
-    },
-    hasCommentForm() {
-      return this.diffLineCommentForms[this.line.lineCode];
-    },
     discussions() {
       return this.discussionsByLineCode[this.line.lineCode] || [];
     },
-    shouldRender() {
-      return this.isDiscussionExpanded || this.hasCommentForm;
-    },
     className() {
       return this.discussions.length ? '' : 'js-temp-notes-holder';
     },
@@ -56,7 +43,6 @@ export default {
 
 <template>
   <tr
-    v-if="shouldRender"
     :class="className"
     class="notes_holder"
   >
@@ -67,6 +53,7 @@ export default {
     <td class="notes_content">
       <div class="content">
         <diff-discussions
+          v-if="discussions.length"
           :discussions="discussions"
         />
         <diff-line-note-form

app/assets/javascripts/diffs/components/inline_diff_table_row.vue

@@ -94,11 +94,12 @@ export default {
       :is-hover="isHover"
       class="diff-line-num new_line"
     />
-    <diff-table-cell
+    <td
+      v-once
       :class="line.type"
-      :diff-file="diffFile"
-      :line="line"
-      :is-content-line="true"
-    />
+      class="line_content"
+      v-html="line.richText"
+    >
+    </td>
   </tr>
 </template>

app/assets/javascripts/diffs/components/inline_diff_view.vue

 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import inlineDiffTableRow from './inline_diff_table_row.vue';
 import inlineDiffCommentRow from './inline_diff_comment_row.vue';
 import { trimFirstCharOfLineContent } from '../store/utils';
@@ -20,7 +20,10 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['commitId']),
+    ...mapGetters(['commitId', 'discussionsByLineCode']),
+    ...mapState({
+      diffLineCommentForms: state => state.diffs.diffLineCommentForms,
+    }),
     normalizedDiffLines() {
       return this.diffLines.map(line => (line.richText ? trimFirstCharOfLineContent(line) : line));
     },
@@ -31,6 +34,18 @@ export default {
       return window.gon.user_color_scheme;
     },
   },
+  methods: {
+    shouldRenderCommentRow(line) {
+      if (this.diffLineCommentForms[line.lineCode]) return true;
+
+      const lineDiscussions = this.discussionsByLineCode[line.lineCode];
+      if (lineDiscussions === undefined) {
+        return false;
+      }
+
+      return lineDiscussions.every(discussion => discussion.expanded);
+    },
+  },
 };
 </script>
 
@@ -50,6 +65,7 @@ export default {
           :key="line.lineCode"
         />
         <inline-diff-comment-row
+          v-if="shouldRenderCommentRow(line)"
           :diff-file="diffFile"
           :diff-lines="normalizedDiffLines"
           :line="line"

app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue

@@ -55,13 +55,6 @@ export default {
     hasAnyExpandedDiscussion() {
       return this.hasExpandedDiscussionOnLeft || this.hasExpandedDiscussionOnRight;
     },
-    shouldRenderDiscussionsRow() {
-      const hasDiscussion = this.hasDiscussion && this.hasAnyExpandedDiscussion;
-      const hasCommentFormOnLeft = this.diffLineCommentForms[this.leftLineCode];
-      const hasCommentFormOnRight = this.diffLineCommentForms[this.rightLineCode];
-
-      return hasDiscussion || hasCommentFormOnLeft || hasCommentFormOnRight;
-    },
     shouldRenderDiscussionsOnLeft() {
       return this.discussionsByLineCode[this.leftLineCode] && this.hasExpandedDiscussionOnLeft;
     },
@@ -81,7 +74,6 @@ export default {
 
 <template>
   <tr
-    v-if="shouldRenderDiscussionsRow"
     :class="className"
     class="notes_holder"
   >
@@ -92,6 +84,7 @@ export default {
         class="content"
       >
         <diff-discussions
+          v-if="discussionsByLineCode[leftLineCode].length"
           :discussions="discussionsByLineCode[leftLineCode]"
         />
       </div>
@@ -112,6 +105,7 @@ export default {
         class="content"
       >
         <diff-discussions
+          v-if="discussionsByLineCode[rightLineCode].length"
           :discussions="discussionsByLineCode[rightLineCode]"
         />
       </div>

app/assets/javascripts/diffs/components/parallel_diff_table_row.vue

@@ -113,17 +113,15 @@ export default {
       :diff-view-type="parallelDiffViewType"
       class="diff-line-num old_line"
     />
-    <diff-table-cell
+    <td
+      v-once
       :id="line.left.lineCode"
-      :diff-file="diffFile"
-      :line="line"
-      :is-content-line="true"
-      :line-position="linePositionLeft"
-      :line-type="parallelViewLeftLineType"
-      :diff-view-type="parallelDiffViewType"
+      :class="parallelViewLeftLineType"
       class="line_content parallel left-side"
       @mousedown.native="handleParallelLineMouseDown"
-    />
+      v-html="line.left.richText"
+    >
+    </td>
     <diff-table-cell
       :diff-file="diffFile"
       :line="line"
@@ -135,16 +133,14 @@ export default {
       :diff-view-type="parallelDiffViewType"
       class="diff-line-num new_line"
     />
-    <diff-table-cell
+    <td
+      v-once
       :id="line.right.lineCode"
-      :diff-file="diffFile"
-      :line="line"
-      :is-content-line="true"
-      :line-position="linePositionRight"
-      :line-type="line.right.type"
-      :diff-view-type="parallelDiffViewType"
+      :class="line.right.type"
       class="line_content parallel right-side"
       @mousedown.native="handleParallelLineMouseDown"
-    />
+      v-html="line.right.richText"
+    >
+    </td>
   </tr>
 </template>

app/assets/javascripts/diffs/components/parallel_diff_view.vue

 <script>
-import { mapGetters } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 import parallelDiffTableRow from './parallel_diff_table_row.vue';
 import parallelDiffCommentRow from './parallel_diff_comment_row.vue';
 import { EMPTY_CELL_TYPE } from '../constants';
@@ -21,7 +21,10 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['commitId']),
+    ...mapGetters(['commitId', 'discussionsByLineCode']),
+    ...mapState({
+      diffLineCommentForms: state => state.diffs.diffLineCommentForms,
+    }),
     parallelDiffLines() {
       return this.diffLines.map(line => {
         const parallelLine = Object.assign({}, line);
@@ -48,6 +51,32 @@ export default {
       return window.gon.user_color_scheme;
     },
   },
+  methods: {
+    shouldRenderCommentRow(line) {
+      const leftLineCode = line.left.lineCode;
+      const rightLineCode = line.right.lineCode;
+      const discussions = this.discussionsByLineCode;
+      const leftDiscussions = discussions[leftLineCode];
+      const rightDiscussions = discussions[rightLineCode];
+      const hasDiscussion = leftDiscussions || rightDiscussions;
+
+      const hasExpandedDiscussionOnLeft = leftDiscussions
+        ? leftDiscussions.every(discussion => discussion.expanded)
+        : false;
+      const hasExpandedDiscussionOnRight = rightDiscussions
+        ? rightDiscussions.every(discussion => discussion.expanded)
+        : false;
+
+      if (hasDiscussion && (hasExpandedDiscussionOnLeft || hasExpandedDiscussionOnRight)) {
+        return true;
+      }
+
+      const hasCommentFormOnLeft = this.diffLineCommentForms[leftLineCode];
+      const hasCommentFormOnRight = this.diffLineCommentForms[rightLineCode];
+
+      return hasCommentFormOnLeft || hasCommentFormOnRight;
+    },
+  },
 };
 </script>
 
@@ -69,6 +98,7 @@ export default {
             :key="index"
           />
           <parallel-diff-comment-row
+            v-if="shouldRenderCommentRow(line)"
             :key="line.left.lineCode || line.right.lineCode"
             :line="line"
             :diff-file="diffFile"

app/assets/javascripts/ide/lib/themes/gl_theme.js

@@ -9,6 +9,7 @@ export default {
       'diffEditor.insertedTextBackground': '#ddfbe6',
       'diffEditor.removedTextBackground': '#f9d7dc',
       'editor.selectionBackground': '#aad6f8',
+      'editorIndentGuide.activeBackground': '#cccccc',
     },
   },
 };

app/assets/javascripts/notes/stores/actions.js

@@ -41,6 +41,15 @@ export const fetchDiscussions = ({ commit }, path) =>
       commit(types.SET_INITIAL_DISCUSSIONS, discussions);
     });
 
+export const refetchDiscussionById = ({ commit }, { path, discussionId }) =>
+  service
+    .fetchDiscussions(path)
+    .then(res => res.json())
+    .then(discussions => {
+      const selectedDiscussion = discussions.find(discussion => discussion.id === discussionId);
+      if (selectedDiscussion) commit(types.UPDATE_DISCUSSION, selectedDiscussion);
+    });
+
 export const deleteNote = ({ commit }, note) =>
   service.deleteNote(note.path).then(() => {
     commit(types.DELETE_NOTE, note);

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

@@ -114,7 +114,6 @@ export default {
 
     Object.assign(state, { discussions });
   },
-
   [types.SET_LAST_FETCHED_AT](state, fetchedAt) {
     Object.assign(state, { lastFetchedAt: fetchedAt });
   },

app/models/concerns/cacheable_attributes.rb

@@ -7,7 +7,7 @@ module CacheableAttributes
 
   class_methods do
     def cache_key
-      "#{name}:#{Gitlab::VERSION}:#{Gitlab.migrations_hash}:#{Rails.version}".freeze
+      "#{name}:#{Gitlab::VERSION}:#{Rails.version}".freeze
     end
 
     # Can be overriden
@@ -69,6 +69,6 @@ module CacheableAttributes
   end
 
   def cache!
-    Rails.cache.write(self.class.cache_key, self)
+    Rails.cache.write(self.class.cache_key, self, expires_in: 1.minute)
   end
 end

changelogs/unreleased/48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade.yml

+---
+title: Resolve compatibility issues with node 6
+merge_request: 20461
+author:
+type: fixed

changelogs/unreleased/48670-application-settings-may-not-be-invalidated-if-migrations-are-run.yml

+---
+title: Stop relying on migrations in the CacheableAttributes cache key and cache attributes
+  for 1 minute instead
+merge_request: 20389
+author:
+type: fixed

changelogs/unreleased/48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml

+---
+title: "[Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass
+  of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace'"
+merge_request: 20462
+author: "@blackst0ne"
+type: fixed

changelogs/unreleased/48978-fix-helm-installation-on-cluster.yml

+---
+title: Fixes base command used in Helm installations
+merge_request: 20471
+author:
+type: fixed

changelogs/unreleased/perf-wiki-pattern-once.yml

+---
+title: Improve render performance of large wiki pages
+merge_request: 20465
+author: Peter Leitzen
+type: performance

config/gitlab.yml.example

@@ -160,6 +160,9 @@ production: &base
     #     aws_access_key_id: AWS_ACCESS_KEY_ID
     #     aws_secret_access_key: AWS_SECRET_ACCESS_KEY
     #     region: us-east-1
+    #     aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
+    #     endpoint: 'https://s3.amazonaws.com' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
+
 
   ## Git LFS
   lfs:
@@ -180,6 +183,7 @@ production: &base
         # Use the following options to configure an AWS compatible host
         # host: 'localhost' # default: s3.amazonaws.com
         # endpoint: 'http://127.0.0.1:9000' # default: nil
+        # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
         # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
 
   ## Uploads (attachments, avatars, etc...)
@@ -197,6 +201,7 @@ production: &base
         provider: AWS
         aws_access_key_id: AWS_ACCESS_KEY_ID
         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+        aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
         region: us-east-1
         # host: 'localhost' # default: s3.amazonaws.com
         # endpoint: 'http://127.0.0.1:9000' # default: nil

db/schema.rb

@@ -2905,8 +2905,12 @@ ActiveRecord::Schema.define(version: 20180702181530) do
   add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify
   add_foreign_key "gpg_signatures", "projects", on_delete: :cascade
   add_foreign_key "group_custom_attributes", "namespaces", column: "group_id", on_delete: :cascade
+<<<<<<< HEAD
   add_foreign_key "identities", "saml_providers", name: "fk_aade90f0fc", on_delete: :cascade
   add_foreign_key "index_statuses", "projects", name: "fk_74b2492545", on_delete: :cascade
+=======
+  add_foreign_key "import_export_uploads", "projects", on_delete: :cascade
+>>>>>>> upstream/master
   add_foreign_key "internal_ids", "namespaces", name: "fk_162941d509", on_delete: :cascade
   add_foreign_key "internal_ids", "projects", on_delete: :cascade
   add_foreign_key "issue_assignees", "issues", name: "fk_b7d881734a", on_delete: :cascade

doc/ci/variables/README.md

@@ -65,7 +65,11 @@ future GitLab releases.**
 | **CI_JOB_MANUAL**               | 8.12   | all    | The flag to indicate that job was manually started |
 | **CI_JOB_NAME**                 | 9.0    | 0.5    | The name of the job as defined in `.gitlab-ci.yml` |
 | **CI_JOB_STAGE**                | 9.0    | 0.5    | The name of the stage as defined in `.gitlab-ci.yml` |
+<<<<<<< HEAD
 | **CI_JOB_TOKEN**                | 9.0    | 1.2    | Token used for authenticating with the GitLab Container Registry. Also used to authenticate with multi-project pipelines when [triggers][trigger-job-token] are involved. |
+=======
+| **CI_JOB_TOKEN**                | 9.0    | 1.2    | Token used for authenticating with the GitLab Container Registry |
+>>>>>>> upstream/master
 | **CI_JOB_URL**                  | 11.1   | 0.5    | Job details URL |
 | **CI_REPOSITORY_URL**           | 9.0    | all    | The URL to clone the Git repository |
 | **CI_RUNNER_DESCRIPTION**       | 8.10   | 0.5    | The description of the runner as saved in GitLab |

doc/development/i18n/externalization.md

@@ -281,7 +281,7 @@ Now that the new content is marked for translation, we need to update the PO
 files with the following command:
 
 ```sh
-bin/rake gettext:find
+bin/rake gettext:regenerate
 ```
 
 This command will update the `locale/gitlab.pot` file with the newly externalized
@@ -292,16 +292,6 @@ file in. Once the changes are on master, they will be picked up by
 If there are merge conflicts in the `gitlab.pot` file, you can delete the file
 and regenerate it using the same command. Confirm that you are not deleting any strings accidentally by looking over the diff.
 
-The command also updates the translation files for each language: `locale/*/gitlab.po`
-These changes can be discarded, the language files will be updated by Crowdin
-automatically.
-
-Discard all of them at once like this:
-
-```sh
-git checkout locale/*/gitlab.po
-```
-
 ### Validating PO files
 
 To make sure we keep our translation files up to date, there's a linter that is

doc/gitlab-basics/create-project.md

@@ -30,6 +30,9 @@
       idea to fill this in.
     - Changing the **Visibility Level** modifies the project's
       [viewing and access rights](../public_access/public_access.md) for users.
+    - Selecting the **Initialize repository with a README** option creates a
+      README so that the Git repository is initialized, has a default branch and
+      can be cloned.
 
 1. Click **Create project**.
 

doc/public_access/public_access.md

@@ -30,6 +30,12 @@ in users.
 Any logged in user will have [Guest](../user/permissions.md) permissions
 on the repository.
 
+### Private projects
+
+Private projects can only be cloned and viewed by project members, and
+they will only appear to project members on the public access directory
+(`https://gitlab.example.com/public`).
+
 ### How to change project visibility
 
 1. Go to your project's **Settings**

doc/user/project/clusters/index.md

@@ -153,6 +153,13 @@ GitLab provides a one-click install for various applications which will be
 added directly to your configured cluster. Those applications are needed for
 [Review Apps](../../../ci/review_apps/index.md) and [deployments](../../../ci/environments.md).
 
+NOTE: **Note:**
+The applications will be installed in a dedicated namespace called
+`gitlab-managed-apps`. In case you have added an existing Kubernetes cluster
+with Tiller already installed, you should be careful as GitLab cannot
+detect it. By installing it via the applications will result into having it
+twice, which can lead to confusion during deployments.
+
 | Application | GitLab version | Description |
 | ----------- | :------------: | ----------- |
 | [Helm Tiller](https://docs.helm.sh/) | 10.2+ | Helm is a package manager for Kubernetes and is required to install all the other applications. It is installed in its own pod inside the cluster which can run the `helm` CLI in a safe environment. |

lib/banzai/filter/abstract_reference_filter.rb

@@ -100,6 +100,11 @@ module Banzai
         ref_pattern = object_class.reference_pattern
         link_pattern = object_class.link_reference_pattern
 
+        # Compile often used regexps only once outside of the loop
+        ref_pattern_anchor = /\A#{ref_pattern}\z/
+        link_pattern_start = /\A#{link_pattern}/
+        link_pattern_anchor = /\A#{link_pattern}\z/
+
         nodes.each do |node|
           if text_node?(node) && ref_pattern
             replace_text_when_pattern_matches(node, ref_pattern) do |content|
@@ -108,7 +113,7 @@ module Banzai
 
           elsif element_node?(node)
             yield_valid_link(node) do |link, inner_html|
-              if ref_pattern && link =~ /\A#{ref_pattern}\z/
+              if ref_pattern && link =~ ref_pattern_anchor
                 replace_link_node_with_href(node, link) do
                   object_link_filter(link, ref_pattern, link_content: inner_html)
                 end
@@ -118,7 +123,7 @@ module Banzai
 
               next unless link_pattern
 
-              if link == inner_html && inner_html =~ /\A#{link_pattern}/
+              if link == inner_html && inner_html =~ link_pattern_start
                 replace_link_node_with_text(node, link) do
                   object_link_filter(inner_html, link_pattern, link_reference: true)
                 end
@@ -126,7 +131,7 @@ module Banzai
                 next
               end
 
-              if link =~ /\A#{link_pattern}\z/
+              if link =~ link_pattern_anchor
                 replace_link_node_with_href(node, link) do
                   object_link_filter(link, link_pattern, link_content: inner_html, link_reference: true)
                 end

lib/gitlab.rb

@@ -9,10 +9,6 @@ module Gitlab
     Settings
   end
 
-  def self.migrations_hash
-    @_migrations_hash ||= Digest::MD5.hexdigest(ActiveRecord::Migrator.get_all_versions.to_s)
-  end
-
   def self.revision
     @_revision ||= begin
       if File.exist?(root.join("REVISION"))

lib/gitlab/background_migration/fix_cross_project_label_links.rb

@@ -11,6 +11,7 @@ module Gitlab
       end
 
       class Label < ActiveRecord::Base
+        self.inheritance_column = :_type_disabled
         self.table_name = 'labels'
       end
 
@@ -27,6 +28,7 @@ module Gitlab
       end
 
       class Namespace < ActiveRecord::Base
+        self.inheritance_column = :_type_disabled
         self.table_name = 'namespaces'
 
         def self.groups_with_descendants_ids(start_id, stop_id)

lib/gitlab/git/blob.rb

@@ -50,13 +50,7 @@ module Gitlab
         end
 
         def raw(repository, sha)
-          Gitlab::GitalyClient.migrate(:git_blob_raw) do |is_enabled|
-            if is_enabled
           repository.gitaly_blob_client.get_blob(oid: sha, limit: MAX_DATA_DISPLAY_SIZE)
-            else
-              rugged_raw(repository, sha, limit: MAX_DATA_DISPLAY_SIZE)
-            end
-          end
         end
 
         # Returns an array of Blob instances, specified in blob_references as
@@ -207,16 +201,7 @@ module Gitlab
 
         return if @loaded_all_data
 
-        @data = Gitlab::GitalyClient.migrate(:git_blob_load_all_data) do |is_enabled|
-          begin
-            if is_enabled
-              repository.gitaly_blob_client.get_blob(oid: id, limit: -1).data
-            else
-              repository.lookup(id).content
-            end
-          end
-        end
-
+        @data = repository.gitaly_blob_client.get_blob(oid: id, limit: -1).data
         @loaded_all_data = true
         @loaded_size = @data.bytesize
       end

lib/gitlab/git/commit.rb

@@ -164,13 +164,8 @@ module Gitlab
         # relation to each other. The last 10 commits for a branch for example,
         # should go through .where
         def batch_by_oid(repo, oids)
-          repo.gitaly_migrate(:list_commits_by_oid,
-                              status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-            if is_enabled
+          repo.wrapped_gitaly_errors do
             repo.gitaly_commit_client.list_commits_by_oid(oids)
-            else
-              oids.map { |oid| find(repo, oid) }.compact
-            end
           end
         end
 
@@ -289,14 +284,7 @@ module Gitlab
 
       def deltas
         @deltas ||= begin
-          deltas = Gitlab::GitalyClient.migrate(:commit_deltas) do |is_enabled|
-            if is_enabled
-              @repository.gitaly_commit_client.commit_deltas(self)
-            else
-              rugged_diff_from_parent.each_delta
-            end
-          end
-
+          deltas = @repository.gitaly_commit_client.commit_deltas(self)
           deltas.map { |delta| Gitlab::Git::Diff.new(delta) }
         end
       end

lib/gitlab/git/repository.rb

@@ -439,29 +439,9 @@ module Gitlab
           raise ArgumentError.new("invalid Repository#log limit: #{limit.inspect}")
         end
 
-        gitaly_migrate(:find_commits) do |is_enabled|
-          if is_enabled
+        wrapped_gitaly_errors do
           gitaly_commit_client.find_commits(options)
-          else
-            raw_log(options).map { |c| Commit.decorate(self, c) }
-          end
-        end
-      end
-
-      # Used in gitaly-ruby
-      def raw_log(options)
-        sha =
-          unless options[:all]
-            actual_ref = options[:ref] || root_ref
-            begin
-              sha_from_ref(actual_ref)
-            rescue Rugged::OdbError, Rugged::InvalidError, Rugged::ReferenceError
-              # Return an empty array if the ref wasn't found
-              return []
-            end
         end
-
-        log_by_shell(sha, options)
       end
 
       def count_commits(options)
@@ -1223,12 +1203,10 @@ module Gitlab
       end
 
       def find_commits_by_message(query, ref, path, limit, offset)
-        gitaly_migrate(:commits_by_message) do |is_enabled|
-          if is_enabled
-            find_commits_by_message_by_gitaly(query, ref, path, limit, offset)
-          else
-            find_commits_by_message_by_shelling_out(query, ref, path, limit, offset)
-          end
+        wrapped_gitaly_errors do
+          gitaly_commit_client
+            .commits_by_message(query, revision: ref, path: path, limit: limit, offset: offset)
+            .map { |c| commit(c) }
         end
       end
 
@@ -1238,12 +1216,8 @@ module Gitlab
       end
 
       def last_commit_for_path(sha, path)
-        gitaly_migrate(:last_commit_for_path) do |is_enabled|
-          if is_enabled
-            last_commit_for_path_by_gitaly(sha, path)
-          else
-            last_commit_for_path_by_rugged(sha, path)
-          end
+        wrapped_gitaly_errors do
+          gitaly_commit_client.last_commit_for_path(sha, path)
         end
       end
 
@@ -1454,46 +1428,6 @@ module Gitlab
         end
       end
 
-      # Gitaly note: JV: although #log_by_shell shells out to Git I think the
-      # complexity is such that we should migrate it as Ruby before trying to
-      # do it in Go.
-      def log_by_shell(sha, options)
-        limit = options[:limit].to_i
-        offset = options[:offset].to_i
-        use_follow_flag = options[:follow] && options[:path].present?
-
-        # We will perform the offset in Ruby because --follow doesn't play well with --skip.
-        # See: https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520
-        offset_in_ruby = use_follow_flag && options[:offset].present?
-        limit += offset if offset_in_ruby
-
-        cmd = %w[log]
-        cmd << "--max-count=#{limit}"
-        cmd << '--format=%H'
-        cmd << "--skip=#{offset}" unless offset_in_ruby
-        cmd << '--follow' if use_follow_flag
-        cmd << '--no-merges' if options[:skip_merges]
-        cmd << "--after=#{options[:after].iso8601}" if options[:after]
-        cmd << "--before=#{options[:before].iso8601}" if options[:before]
-
-        if options[:all]
-          cmd += %w[--all --reverse]
-        else
-          cmd << sha
-        end
-
-        # :path can be a string or an array of strings
-        if options[:path].present?
-          cmd << '--'
-          cmd += Array(options[:path])
-        end
-
-        raw_output, _status = run_git(cmd)
-        lines = offset_in_ruby ? raw_output.lines.drop(offset) : raw_output.lines
-
-        lines.map! { |c| Rugged::Commit.new(rugged, c.strip) }
-      end
-
       # We are trying to deprecate this method because it does a lot of work
       # but it seems to be used only to look up submodule URL's.
       # https://gitlab.com/gitlab-org/gitaly/issues/329
@@ -1623,11 +1557,6 @@ module Gitlab
         end
       end
 
-      def last_commit_for_path_by_rugged(sha, path)
-        sha = last_commit_id_for_path_by_shelling_out(sha, path)
-        commit(sha)
-      end
-
       # Returns true if the given ref name exists
       #
       # Ref names must start with `refs/`.
@@ -1820,35 +1749,6 @@ module Gitlab
         raise CommandError, @gitlab_projects.output
       end
 
-      def find_commits_by_message_by_shelling_out(query, ref, path, limit, offset)
-        ref ||= root_ref
-
-        args = %W(
-          log #{ref} --pretty=%H --skip #{offset}
-          --max-count #{limit} --grep=#{query} --regexp-ignore-case
-        )
-        args = args.concat(%W(-- #{path})) if path.present?
-
-        git_log_results = run_git(args).first.lines
-
-        git_log_results.map { |c| commit(c.chomp) }.compact
-      end
-
-      def find_commits_by_message_by_gitaly(query, ref, path, limit, offset)
-        gitaly_commit_client
-          .commits_by_message(query, revision: ref, path: path, limit: limit, offset: offset)
-          .map { |c| commit(c) }
-      end
-
-      def last_commit_for_path_by_gitaly(sha, path)
-        gitaly_commit_client.last_commit_for_path(sha, path)
-      end
-
-      def last_commit_id_for_path_by_shelling_out(sha, path)
-        args = %W(rev-list --max-count=1 #{sha} -- #{path})
-        run_git_with_timeout(args, Gitlab::Git::Popen::FAST_GIT_PROCESS_TIMEOUT).first.strip
-      end
-
       def rugged_merge_base(from, to)
         rugged.merge_base(from, to)
       rescue Rugged::ReferenceError
@@ -1862,35 +1762,6 @@ module Gitlab
       def sha_from_ref(ref)
         rev_parse_target(ref).oid
       end
-
-      def build_git_cmd(*args)
-        object_directories = alternate_object_directories.join(File::PATH_SEPARATOR)
-
-        env = { 'PWD' => self.path }
-        env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] = object_directories if object_directories.present?
-
-        [
-          env,
-          ::Gitlab.config.git.bin_path,
-          *args,
-          { chdir: self.path }
-        ]
-      end
-
-      def git_diff_cmd(old_rev, new_rev)
-        old_rev = old_rev == ::Gitlab::Git::BLANK_SHA ? ::Gitlab::Git::EMPTY_TREE_ID : old_rev
-
-        build_git_cmd('diff', old_rev, new_rev, '--raw')
-      end
-
-      def git_cat_file_cmd
-        format = '%(objectname) %(objectsize) %(rest)'
-        build_git_cmd('cat-file', "--batch-check=#{format}")
-      end
-
-      def format_git_cat_file_script
-        File.expand_path('../support/format-git-cat-file-input', __FILE__)
-      end
     end
   end
 end

lib/gitlab/git/support/format-git-cat-file-input

-#!/usr/bin/env ruby
-
-# This script formats the output of the `git diff <old_rev> <new_rev> --raw`
-# command so it can be processed by `git cat-file`
-
-# We need to convert this:
-# ":100644 100644 5f53439... 85bc2f9... R060\tfiles/js/commit.js.coffee\tfiles/js/commit.coffee"
-# To:
-# "85bc2f9 R\tfiles/js/commit.js.coffee\tfiles/js/commit.coffee"
-
-ARGF.each do |line|
-  _, _, old_blob_id, new_blob_id, rest = line.split(/\s/, 5)
-
-  old_blob_id.gsub!(/[^\h]/, '')
-  new_blob_id.gsub!(/[^\h]/, '')
-
-  # We can't pass '0000000...' to `git cat-file` given it will not return info about the deleted file
-  blob_id = new_blob_id =~ /\A0+\z/ ? old_blob_id : new_blob_id
-
-  $stdout.puts "#{blob_id} #{rest}"
-end

lib/gitlab/kubernetes/helm/base_command.rb

@@ -18,7 +18,7 @@ module Gitlab
             ALPINE_VERSION=$(cat /etc/alpine-release | cut -d '.' -f 1,2)
             echo http://mirror.clarkson.edu/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
             echo http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
-            apk add -U ca-certificates openssl >/dev/null
+            apk add -U wget ca-certificates openssl >/dev/null
             wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v#{Gitlab::Kubernetes::Helm::HELM_VERSION}-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
             mv /tmp/linux-amd64/helm /usr/bin/
           HEREDOC

lib/gitlab/middleware/read_only/controller.rb

@@ -69,6 +69,7 @@ module Gitlab
           @route_hash ||= Rails.application.routes.recognize_path(request.url, { method: request.request_method }) rescue {}
         end
 
+        # Overridden in EE module
         def whitelisted_routes
           grack_route || ReadOnly.internal_routes.any? { |path| request.path.include?(path) } || lfs_route || sidekiq_route
         end

lib/gitlab/shell.rb

@@ -74,17 +74,10 @@ module Gitlab
       relative_path = name.dup
       relative_path << '.git' unless relative_path.end_with?('.git')
 
-      gitaly_migrate(:create_repository,
-                     status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-        if is_enabled
       repository = Gitlab::Git::Repository.new(storage, relative_path, '')
-          repository.gitaly_repository_client.create_repository
+      wrapped_gitaly_errors { repository.gitaly_repository_client.create_repository }
+
       true
-        else
-          repo_path = File.join(Gitlab.config.repositories.storages[storage].legacy_disk_path, relative_path)
-          Gitlab::Git::Repository.create(repo_path, bare: true, symlink_hooks_to: gitlab_shell_hooks_path)
-        end
-      end
     rescue => err # Once the Rugged codes gets removes this can be improved
       Rails.logger.error("Failed to add repository #{storage}/#{name}: #{err}")
       false
@@ -448,7 +441,11 @@ module Gitlab
     end
 
     def gitaly_migrate(method, status: Gitlab::GitalyClient::MigrationStatus::OPT_IN, &block)
-      Gitlab::GitalyClient.migrate(method, status: status, &block)
+      wrapped_gitaly_errors { Gitlab::GitalyClient.migrate(method, status: status, &block) }
+    end
+
+    def wrapped_gitaly_errors
+      yield
     rescue GRPC::NotFound, GRPC::BadStatus => e
       # Old Popen code returns [Error, output] to the caller, so we
       # need to do the same here...

lib/gitlab/workhorse.rb

@@ -37,8 +37,7 @@ module Gitlab
       end
 
       def send_git_blob(repository, blob)
-        params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
-                   {
+        params = {
           'GitalyServer' => gitaly_server_hash(repository),
           'GetBlobRequest' => {
             repository: repository.gitaly_repository.to_h,
@@ -46,12 +45,6 @@ module Gitlab
             limit: -1
           }
         }
-                 else
-                   {
-                     'RepoPath' => repository.path_to_repo,
-                     'BlobId' => blob.id
-                   }
-                 end
 
         [
           SEND_DATA_HEADER,

locale/gitlab.pot

@@ -8,8 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2018-07-09 08:42+0200\n"
 "PO-Revision-Date: 2018-07-09 08:42+0200\n"
+=======
+"POT-Creation-Date: 2018-07-09 08:28+0200\n"
+"PO-Revision-Date: 2018-07-09 08:28+0200\n"
+>>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -2481,6 +2486,7 @@ msgstr ""
 msgid "Epic"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Epic will be removed! Are you sure?"
 msgstr ""
 
@@ -2502,6 +2508,11 @@ msgstr ""
 msgid "Error fetching contributors data."
 msgstr ""
 
+=======
+msgid "Error fetching contributors data."
+msgstr ""
+
+>>>>>>> upstream/master
 msgid "Error fetching labels."
 msgstr ""
 
@@ -2520,6 +2531,9 @@ msgstr ""
 msgid "Error loading last commit."
 msgstr ""
 
+msgid "Error loading markdown preview"
+msgstr ""
+
 msgid "Error loading merge requests."
 msgstr ""
 
@@ -3298,9 +3312,12 @@ msgid "Introducing Cycle Analytics"
 msgstr ""
 
 msgid "Issue Boards"
+<<<<<<< HEAD
 msgstr ""
 
 msgid "Issue board focus mode"
+=======
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Issue events"
@@ -3515,12 +3532,15 @@ msgstr ""
 msgid "Locked to current projects"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Locks give the ability to lock specific file or folder."
 msgstr ""
 
 msgid "Make everyone on your team more productive regardless of their location. GitLab Geo creates read-only mirrors of your GitLab instance so you can reduce the time it takes to clone and fetch large repos."
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Manage all notifications"
 msgstr ""
 
@@ -3560,9 +3580,12 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"."
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Merge Request"
 msgstr ""
 
@@ -3713,12 +3736,46 @@ msgstr ""
 msgid "Metrics|e.g. Throughput"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Metrics|e.g. rate(http_requests_total[5m])"
+=======
+msgid "Metrics"
+msgstr ""
+
+msgid "Metrics - Influx"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Metrics|e.g. req/sec"
 msgstr ""
 
+msgid "Metrics|Check out the CI/CD documentation on deploying to an environment"
+msgstr ""
+
+msgid "Metrics|Environment"
+msgstr ""
+
+msgid "Metrics|Learn about environments"
+msgstr ""
+
+msgid "Metrics|No deployed environments"
+msgstr ""
+
+msgid "Metrics|There was an error fetching the environments data, please try again"
+msgstr ""
+
+msgid "Metrics|There was an error getting deployment information."
+msgstr ""
+
+msgid "Metrics|There was an error getting environments information."
+msgstr ""
+
+msgid "Metrics|Unexpected deployment data response from prometheus endpoint"
+msgstr ""
+
+msgid "Metrics|Unexpected metrics data response from prometheus endpoint"
+msgstr ""
+
 msgid "Milestone"
 msgstr ""
 
@@ -4060,9 +4117,12 @@ msgstr ""
 msgid "Oops, are you sure?"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Open"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Open in Xcode"
 msgstr ""
 
@@ -5647,12 +5707,15 @@ msgstr ""
 msgid "There are problems accessing Git storage: "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "There was an error adding a todo."
 msgstr ""
 
 msgid "There was an error deleting the todo."
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "There was an error loading users activity calendar."
 msgstr ""
 
@@ -6947,12 +7010,15 @@ msgstr ""
 msgid "mrWidget|Merged by"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "mrWidget|No Approval required"
 msgstr ""
 
 msgid "mrWidget|No Approval required; you can still approve"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "mrWidget|Open in Web IDE"
 msgstr ""
 

package.json

@@ -69,7 +69,7 @@
     "katex": "^0.8.3",
     "marked": "^0.3.12",
     "monaco-editor": "0.13.1",
-    "monaco-editor-webpack-plugin": "^1.2.1",
+    "monaco-editor-webpack-plugin": "^1.4.0",
     "mousetrap": "^1.4.6",
     "pikaday": "^1.6.1",
     "popper.js": "^1.14.3",

scripts/frontend/prettier.js

@@ -49,7 +49,7 @@ const stagedFiles =
 if (stagedFiles) {
   if (!stagedFiles.length || (stagedFiles.length === 1 && !stagedFiles[0])) {
     console.log('No matching staged files.');
-    return;
+    process.exit(1);
   }
   console.log(`Matching staged Files : ${stagedFiles.length}`);
 }
@@ -78,7 +78,7 @@ files = prettierIgnore.filter(files);
 
 if (!files.length) {
   console.log('No Files found to process with Prettier');
-  return;
+  process.exit(1);
 }
 
 console.log(`${shouldSave ? 'Updating' : 'Checking'} ${files.length} file(s)`);

spec/javascripts/diffs/components/diff_file_spec.js

@@ -31,12 +31,12 @@ describe('DiffFile', () => {
 
     describe('collapsed', () => {
       it('should not have file content', done => {
-        expect(vm.$el.querySelectorAll('.diff-content.hidden').length).toEqual(0);
+        expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(1);
         expect(vm.file.collapsed).toEqual(false);
         vm.file.collapsed = true;
 
         vm.$nextTick(() => {
-          expect(vm.$el.querySelectorAll('.diff-content.hidden').length).toEqual(1);
+          expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(0);
 
           done();
         });

spec/lib/gitlab/git/blob_spec.rb

@@ -532,8 +532,8 @@ describe Gitlab::Git::Blob, seed_helper: true do
     subject { blob.load_all_data!(repository) }
 
     it 'loads missing data' do
-      expect(Gitlab::GitalyClient).to receive(:migrate)
-        .with(:git_blob_load_all_data).and_return(full_data)
+      expect(repository.gitaly_blob_client).to receive(:get_blob)
+        .and_return(double(:response, data: full_data))
 
       subject
 
@@ -544,8 +544,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
       let(:blob) { Gitlab::Git::Blob.new(name: 'test', size: 4, data: full_data) }
 
       it "doesn't perform any loading" do
-        expect(Gitlab::GitalyClient).not_to receive(:migrate)
-          .with(:git_blob_load_all_data)
+        expect(repository.gitaly_blob_client).not_to receive(:get_blob)
 
         subject
 

spec/lib/gitlab/middleware/read_only_spec.rb

@@ -4,28 +4,6 @@ describe Gitlab::Middleware::ReadOnly do
   include Rack::Test::Methods
   using RSpec::Parameterized::TableSyntax
 
-  RSpec::Matchers.define :be_a_redirect do
-    match do |response|
-      response.status == 301
-    end
-  end
-
-  RSpec::Matchers.define :disallow_request do
-    match do |middleware|
-      alert = middleware.env['rack.session'].to_hash
-        .dig('flash', 'flashes', 'alert')
-
-      alert&.include?('You cannot perform write operations')
-    end
-  end
-
-  RSpec::Matchers.define :disallow_request_in_json do
-    match do |response|
-      json_response = JSON.parse(response.body)
-      response.body.include?('You cannot perform write operations') && json_response.key?('message')
-    end
-  end
-
   let(:rack_stack) do
     rack = Rack::Builder.new do
       use ActionDispatch::Session::CacheStore
@@ -66,38 +44,38 @@ describe Gitlab::Middleware::ReadOnly do
     it 'expects PATCH requests to be disallowed' do
       response = request.patch('/test_request')
 
-      expect(response).to be_a_redirect
+      expect(response).to be_redirect
       expect(subject).to disallow_request
     end
 
     it 'expects PUT requests to be disallowed' do
       response = request.put('/test_request')
 
-      expect(response).to be_a_redirect
+      expect(response).to be_redirect
       expect(subject).to disallow_request
     end
 
     it 'expects POST requests to be disallowed' do
       response = request.post('/test_request')
 
-      expect(response).to be_a_redirect
+      expect(response).to be_redirect
       expect(subject).to disallow_request
     end
 
     it 'expects a internal POST request to be allowed after a disallowed request' do
       response = request.post('/test_request')
 
-      expect(response).to be_a_redirect
+      expect(response).to be_redirect
 
       response = request.post("/api/#{API::API.version}/internal")
 
-      expect(response).not_to be_a_redirect
+      expect(response).not_to be_redirect
     end
 
     it 'expects DELETE requests to be disallowed' do
       response = request.delete('/test_request')
 
-      expect(response).to be_a_redirect
+      expect(response).to be_redirect
       expect(subject).to disallow_request
     end
 
@@ -105,7 +83,7 @@ describe Gitlab::Middleware::ReadOnly do
       expect(Rails.application.routes).to receive(:recognize_path).and_call_original
       response = request.post('/root/gitlab-ce/new/master/app/info/lfs/objects/batch')
 
-      expect(response).to be_a_redirect
+      expect(response).to be_redirect
       expect(subject).to disallow_request
     end
 
@@ -120,19 +98,19 @@ describe Gitlab::Middleware::ReadOnly do
         expect(Rails.application.routes).not_to receive(:recognize_path)
         response = request.post("/api/#{API::API.version}/internal")
 
-        expect(response).not_to be_a_redirect
+        expect(response).not_to be_redirect
         expect(subject).not_to disallow_request
       end
 
       it 'expects requests to sidekiq admin to be allowed' do
         response = request.post('/admin/sidekiq')
 
-        expect(response).not_to be_a_redirect
+        expect(response).not_to be_redirect
         expect(subject).not_to disallow_request
 
         response = request.get('/admin/sidekiq')
 
-        expect(response).not_to be_a_redirect
+        expect(response).not_to be_redirect
         expect(subject).not_to disallow_request
       end
 
@@ -150,7 +128,7 @@ describe Gitlab::Middleware::ReadOnly do
           expect(Rails.application.routes).to receive(:recognize_path).and_call_original
           response = request.post(path)
 
-          expect(response).not_to be_a_redirect
+          expect(response).not_to be_redirect
           expect(subject).not_to disallow_request
         end
       end

spec/lib/gitlab/workhorse_spec.rb

@@ -413,7 +413,6 @@ describe Gitlab::Workhorse do
 
     subject { described_class.send_git_blob(repository, blob) }
 
-    context 'when Gitaly workhorse_raw_show feature is enabled' do
     it 'sets the header correctly' do
       key, command, params = decode_workhorse_header(subject)
 
@@ -433,17 +432,6 @@ describe Gitlab::Workhorse do
     end
   end
 
-    context 'when Gitaly workhorse_raw_show feature is disabled', :disable_gitaly do
-      it 'sets the header correctly' do
-        key, command, params = decode_workhorse_header(subject)
-
-        expect(key).to eq('Gitlab-Workhorse-Send-Data')
-        expect(command).to eq('git-blob')
-        expect(params).to eq('RepoPath' => repository.path_to_repo, 'BlobId' => blob.id)
-      end
-    end
-  end
-
   describe '.send_url' do
     let(:url) { 'http://example.com' }
 

spec/models/concerns/cacheable_attributes_spec.rb

@@ -52,7 +52,7 @@ describe CacheableAttributes do
 
   describe '.cache_key' do
     it 'excludes cache attributes' do
-      expect(minimal_test_class.cache_key).to eq("TestClass:#{Gitlab::VERSION}:#{Gitlab.migrations_hash}:#{Rails.version}")
+      expect(minimal_test_class.cache_key).to eq("TestClass:#{Gitlab::VERSION}:#{Rails.version}")
     end
   end
 

spec/support/matchers/disallow_request_matchers.rb

+RSpec::Matchers.define :disallow_request do
+  match do |middleware|
+    alert = middleware.env['rack.session'].to_hash
+      .dig('flash', 'flashes', 'alert')
+
+    alert&.include?('You cannot perform write operations')
+  end
+end
+
+RSpec::Matchers.define :disallow_request_in_json do
+  match do |response|
+    json_response = JSON.parse(response.body)
+    response.body.include?('You cannot perform write operations') && json_response.key?('message')
+  end
+end

spec/support/shared_examples/helm_generated_script.rb

@@ -6,7 +6,7 @@ shared_examples 'helm commands' do
          ALPINE_VERSION=$(cat /etc/alpine-release | cut -d '.' -f 1,2)
          echo http://mirror.clarkson.edu/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
          echo http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/v$ALPINE_VERSION/main >> /etc/apk/repositories
-         apk add -U ca-certificates openssl >/dev/null
+         apk add -U wget ca-certificates openssl >/dev/null
          wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v2.7.0-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
          mv /tmp/linux-amd64/helm /usr/bin/
       EOS

vendor/gitignore/Autotools.gitignore

@@ -9,7 +9,7 @@ Makefile.in
 
 # http://www.gnu.org/software/autoconf
 
-/autom4te.cache
+autom4te.cache
 /autoscan.log
 /autoscan-*.log
 /aclocal.m4
@@ -39,4 +39,3 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
-autom4te.cache

vendor/gitignore/CraftCMS.gitignore

-# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore]
+# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore)
+# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26)
 /craft/storage/*
-!/craft/storage/logo/*
\ No newline at end of file
+!/craft/storage/rebrand

vendor/gitignore/Eagle.gitignore

@@ -35,7 +35,6 @@ eagle.epf
 *.gpi
 *.pls
 *.ger
-*.gpi
 *.xln
 
 *.drd

vendor/gitignore/GWT.gitignore

@@ -18,9 +18,6 @@ war/WEB-INF/classes/
 #compilation logs
 .gwt/
 
-#caching for already compiled files
-gwt-unitCache/
-
 #gwt junit compilation files
 www-test/
 

vendor/gitignore/Global/Backup.gitignore

+*.bak
+*.gho
+*.ori
+*.orig
+*.tmp

vendor/gitignore/Global/CodeKit.gitignore

 # General CodeKit files to ignore
 config.codekit
+config.codekit3
 /min

vendor/gitignore/Global/Eclipse.gitignore

@@ -47,6 +47,9 @@ local.properties
 # Code Recommenders
 .recommenders/
 
+# Annotation Processing
+.apt_generated/
+
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies

vendor/gitignore/Global/JetBrains.gitignore

@@ -4,6 +4,7 @@
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
+.idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
 
@@ -20,9 +21,16 @@
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
 # CMake
-cmake-build-debug/
-cmake-build-release/
+cmake-build-*/
 
 # Mongo Explorer plugin
 .idea/**/mongoSettings.xml

vendor/gitignore/Global/Matlab.gitignore

@@ -18,6 +18,9 @@ helpsearch*/
 slprj/
 sccprj/
 
+# Matlab code generation folders
+codegen/
+
 # Simulink autosave extension
 *.autosave
 

vendor/gitignore/Global/Patch.gitignore

+*.orig
+*.rej

vendor/gitignore/Global/Vim.gitignore

 # Swap
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
-[._]s[a-v][a-z]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
 [._]sw[a-p]
 
 # Session

vendor/gitignore/LabVIEW.gitignore

@@ -14,3 +14,4 @@
 # Metadata
 *.aliases
 *.lvlps
+.cache/

vendor/gitignore/Maven.gitignore

@@ -7,6 +7,4 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar

vendor/gitignore/Node.gitignore

@@ -57,9 +57,15 @@ typings/
 # dotenv environment variables file
 .env
 
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
 # next.js build output
 .next
 
+# nuxt.js build output
+.nuxt
+
 # vuepress build output
 .vuepress/dist
 

vendor/gitignore/Objective-C.gitignore

@@ -35,6 +35,9 @@ xcuserdata/
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #

vendor/gitignore/Perl6.gitignore

+# Gitignore for Perl 6 (http://www.perl6.org)
+# As part of https://github.com/github/gitignore
+
+# precompiled files
+.precomp
+lib/.precomp
+

vendor/gitignore/Swift.gitignore

@@ -47,6 +47,9 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #

vendor/gitignore/TeX.gitignore

@@ -226,6 +226,9 @@ TSWLatexianTemp*
 # Texpad
 .texpadtmp
 
+# LyX
+*.lyx~
+
 # Kile
 *.backup
 
@@ -241,6 +244,3 @@ TSWLatexianTemp*
 
 # standalone packages
 *.sta
-
-# generated if using elsarticle.cls
-*.spl

vendor/gitignore/Typo3.gitignore

@@ -8,12 +8,15 @@
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
 /typo3conf/deprecation_*.log
-/typo3conf/AdditionalConfiguration.php
+/typo3conf/ENABLE_INSTALL_TOOL
+/typo3conf/realurl_autoconf.php
+/FIRST_INSTALL
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following entries.
 /typo3
 /typo3_src
 /typo3_src-*
+/Packages
 /.htaccess
 /index.php
 # Ignore temp directory.

vendor/gitignore/UnrealEngine.gitignore

 # Visual Studio 2015 user specific files
 .vs/
 
-# Visual Studio 2015 database file
-*.VC.db
-
 # Compiled Object files
 *.slo
 *.lo

vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml

@@ -105,11 +105,14 @@ code_quality:
     - code_quality
   artifacts:
     paths: [gl-code-quality-report.json]
+  only:
+    - branches
   except:
     variables:
       - $CODE_QUALITY_DISABLED
 
 license_management:
+  stage: test
   image: docker:stable
   variables:
     DOCKER_DRIVER: overlay2
@@ -121,6 +124,8 @@ license_management:
     - license_management
   artifacts:
     paths: [gl-license-management-report.json]
+  only:
+    - branches
   except:
     variables:
       - $LICENSE_MANAGEMENT_DISABLED
@@ -161,6 +166,8 @@ sast:
     - sast
   artifacts:
     paths: [gl-sast-report.json]
+  only:
+    - branches
   except:
     variables:
       - $SAST_DISABLED
@@ -178,6 +185,8 @@ dependency_scanning:
     - dependency_scanning
   artifacts:
     paths: [gl-dependency-scanning-report.json]
+  only:
+    - branches
   except:
     variables:
       - $DEPENDENCY_SCANNING_DISABLED
@@ -195,6 +204,8 @@ container_scanning:
     - container_scanning
   artifacts:
     paths: [gl-container-scanning-report.json]
+  only:
+    - branches
   except:
     variables:
       - $CONTAINER_SCANNING_DISABLED
@@ -365,6 +376,7 @@ production_manual:
     kubernetes: active
     variables:
       - $STAGING_ENABLED
+      - $CANARY_ENABLED
   except:
     variables:
       - $INCREMENTAL_ROLLOUT_ENABLED

vendor/licenses.csv

@@ -7,7 +7,7 @@
 @babel/template,7.0.0-beta.44,MIT
 @babel/traverse,7.0.0-beta.44,MIT
 @babel/types,7.0.0-beta.44,MIT
-@gitlab-org/gitlab-svgs,1.23.0,SEE LICENSE IN LICENSE
+@gitlab-org/gitlab-svgs,1.25.0,SEE LICENSE IN LICENSE
 @sindresorhus/is,0.7.0,MIT
 @types/jquery,2.0.48,MIT
 @vue/component-compiler-utils,1.2.1,MIT
@@ -35,7 +35,7 @@ abbrev,1.1.1,ISC
 accepts,1.3.4,MIT
 ace-rails-ap,4.1.2,MIT
 acorn,3.3.0,MIT
-acorn,5.5.3,MIT
+acorn,5.6.2,MIT
 acorn-dynamic-import,3.0.0,MIT
 acorn-jsx,3.0.1,MIT
 actionmailer,4.2.10,MIT
@@ -51,14 +51,12 @@ addressparser,1.0.1,MIT
 aes_key_wrap,1.0.1,MIT
 after,0.8.2,MIT
 agent-base,2.1.1,MIT
-ajv,4.11.8,MIT
 ajv,5.5.2,MIT
 ajv,6.1.1,MIT
 ajv-keywords,2.1.1,MIT
 ajv-keywords,3.1.0,MIT
 akismet,2.0.0,MIT
 align-text,0.1.4,MIT
-allocations,1.0.5,MIT
 alphanum-sort,1.0.2,MIT
 amdefine,1.0.1,BSD-3-Clause OR MIT
 amqplib,0.5.2,MIT
@@ -208,7 +206,7 @@ base64-js,1.2.3,MIT
 base64id,1.0.0,MIT
 batch,0.6.1,MIT
 batch-loader,1.2.1,MIT
-bcrypt,3.1.11,MIT
+bcrypt,3.1.12,MIT
 bcrypt-pbkdf,1.0.1,New BSD
 bcrypt_pbkdf,1.0.0,MIT
 better-assert,1.0.2,MIT
@@ -220,7 +218,6 @@ bitsyntax,0.0.4,Unknown
 bl,1.1.2,MIT
 blackst0ne-mermaid,7.1.0-fixed,MIT
 blob,0.0.4,MIT*
-block-stream,0.0.9,ISC
 bluebird,3.5.1,MIT
 bn.js,4.11.8,MIT
 body-parser,1.18.2,MIT
@@ -269,7 +266,7 @@ camelcase-keys,2.1.0,MIT
 caniuse-api,1.6.1,MIT
 caniuse-db,1.0.30000649,CC-BY-4.0
 capture-stack-trace,1.0.0,MIT
-carrierwave,1.2.1,MIT
+carrierwave,1.2.3,MIT
 caseless,0.11.0,Apache 2.0
 caseless,0.12.0,Apache 2.0
 cause,0.1,MIT
@@ -399,6 +396,7 @@ dashdash,1.14.1,MIT
 data-uri-to-buffer,1.2.0,MIT
 date-format,1.2.0,MIT
 date-now,0.1.4,MIT
+dateformat,3.0.3,MIT
 de-indent,1.0.2,MIT
 debug,2.2.0,MIT
 debug,2.6.8,MIT
@@ -457,7 +455,7 @@ domelementtype,1.3.0,Simplified BSD
 domhandler,2.4.1,Simplified BSD
 domutils,1.6.2,Simplified BSD
 doorkeeper,4.3.2,MIT
-doorkeeper-openid_connect,1.4.0,MIT
+doorkeeper-openid_connect,1.5.0,MIT
 dot-prop,4.2.0,MIT
 double-ended-queue,2.1.0-0,MIT
 dropzone,4.2.0,MIT
@@ -507,7 +505,7 @@ eslint-plugin-html,4.0.3,ISC
 eslint-plugin-import,2.12.0,MIT
 eslint-plugin-jasmine,2.2.0,MIT
 eslint-plugin-promise,3.8.0,ISC
-eslint-plugin-vue,4.0.1,MIT
+eslint-plugin-vue,4.5.0,MIT
 eslint-restricted-globals,0.1.1,MIT
 eslint-scope,3.7.1,Simplified BSD
 eslint-visitor-keys,1.0.0,Apache 2.0
@@ -515,10 +513,9 @@ espree,3.5.4,Simplified BSD
 esprima,2.7.3,Simplified BSD
 esprima,3.1.3,Simplified BSD
 esprima,4.0.0,Simplified BSD
-esquery,1.0.0,New BSD
-esrecurse,4.1.0,Simplified BSD
+esquery,1.0.1,New BSD
+esrecurse,4.2.1,Simplified BSD
 estraverse,1.9.3,Simplified BSD
-estraverse,4.1.1,Simplified BSD
 estraverse,4.2.0,Simplified BSD
 esutils,2.0.2,Simplified BSD
 et-orbi,1.0.3,MIT
@@ -607,11 +604,10 @@ fresh,0.5.2,MIT
 from,0.1.7,MIT
 from2,2.3.0,MIT
 fs-access,1.0.1,MIT
+fs-minipass,1.2.5,ISC
 fs-write-stream-atomic,1.0.10,ISC
 fs.realpath,1.0.0,ISC
-fsevents,1.1.3,MIT
-fstream,1.0.11,ISC
-fstream-ignore,1.0.5,ISC
+fsevents,1.2.4,MIT
 ftp,0.3.10,MIT
 function-bind,1.1.1,MIT
 functional-red-black-tree,1.0.1,MIT
@@ -630,14 +626,14 @@ get_process_mem,0.2.0,MIT
 getpass,0.1.7,MIT
 gettext_i18n_rails,1.8.0,MIT
 gettext_i18n_rails_js,1.3.0,MIT
-gitaly-proto,0.100.0,MIT
+gitaly-proto,0.105.0,MIT
 github-linguist,5.3.3,MIT
 github-markup,1.7.0,MIT
 gitlab-flowdock-git-hook,1.0.1,MIT
-gitlab-gollum-lib,4.2.7.2,MIT
-gitlab-gollum-rugged_adapter,0.4.4,MIT
+gitlab-gollum-lib,4.2.7.5,MIT
+gitlab-gollum-rugged_adapter,0.4.4.1,MIT
 gitlab-grit,2.8.2,MIT
-gitlab-markup,1.6.3,MIT
+gitlab-markup,1.6.4,MIT
 gitlab_omniauth-ldap,2.0.4,MIT
 glob,5.0.15,ISC
 glob,7.1.2,ISC
@@ -664,7 +660,7 @@ gpgme,2.0.13,LGPL-2.1+
 graceful-fs,4.1.11,ISC
 grape,1.0.3,MIT
 grape-entity,0.7.1,MIT
-grape-path-helpers,1.0.4,MIT
+grape-path-helpers,1.0.5,MIT
 grape_logging,1.7.0,MIT
 graphiql-rails,1.4.10,MIT
 graphlib,2.1.1,MIT
@@ -674,10 +670,8 @@ gzip-size,4.1.0,MIT
 hamlit,2.6.1,MIT
 handle-thing,1.2.5,MIT
 handlebars,4.0.6,MIT
-har-schema,1.0.5,ISC
 har-schema,2.0.0,ISC
 har-validator,2.0.6,ISC
-har-validator,4.2.1,ISC
 har-validator,5.0.3,ISC
 has,1.0.1,MIT
 has-ansi,2.0.0,MIT
@@ -712,7 +706,7 @@ hosted-git-info,2.2.0,ISC
 hpack.js,2.1.6,MIT
 html-comment-regex,1.1.1,MIT
 html-entities,1.2.0,MIT
-html-pipeline,2.7.1,MIT
+html-pipeline,2.8.3,MIT
 html2text,0.2.0,MIT
 htmlentities,4.3.4,MIT
 htmlparser2,3.9.2,MIT
@@ -739,13 +733,14 @@ icalendar,2.4.1,ruby
 ice_nine,0.11.2,MIT
 iconv-lite,0.4.15,MIT
 iconv-lite,0.4.19,MIT
+iconv-lite,0.4.23,MIT
 icss-replace-symbols,1.1.0,ISC
 icss-utils,2.1.0,ISC
 ieee754,1.1.11,New BSD
-ieee754,1.1.8,New BSD
 iferr,0.1.5,MIT
 ignore,3.3.8,MIT
 ignore-by-default,1.0.1,ISC
+ignore-walk,3.0.1,ISC
 immediate,3.0.6,MIT
 import-lazy,2.1.0,MIT
 import-local,1.0.0,MIT
@@ -865,16 +860,14 @@ jsesc,1.3.0,MIT
 jsesc,2.5.1,MIT
 json,1.8.6,ruby
 json-buffer,3.0.0,MIT
-json-jwt,1.9.2,MIT
+json-jwt,1.9.4,MIT
 json-parse-better-errors,1.0.2,MIT
 json-schema,0.2.3,BSD
 json-schema-traverse,0.3.1,MIT
-json-stable-stringify,1.0.1,MIT
 json-stable-stringify-without-jsonify,1.0.1,MIT
 json-stringify-safe,5.0.1,ISC
 json3,3.3.2,MIT
 json5,0.5.1,MIT
-jsonify,0.0.0,Public Domain
 jsonpointer,4.0.1,MIT
 jsprim,1.4.1,MIT
 jszip,3.1.3,(MIT OR GPL-3.0)
@@ -992,12 +985,14 @@ minimatch,3.0.4,ISC
 minimist,0.0.10,MIT
 minimist,0.0.8,MIT
 minimist,1.2.0,MIT
+minipass,2.3.3,ISC
+minizlib,1.1.0,MIT
 mississippi,2.0.0,Simplified BSD
 mixin-deep,1.3.1,MIT
 mkdirp,0.5.1,MIT
 moment,2.19.2,MIT
 monaco-editor,0.13.1,MIT
-monaco-editor-webpack-plugin,1.2.1,MIT
+monaco-editor-webpack-plugin,1.4.0,MIT
 mousetrap,1.4.6,Apache 2.0
 mousetrap-rails,1.4.6,"MIT,Apache"
 move-concurrently,1.0.1,ISC
@@ -1012,9 +1007,10 @@ mustermann,1.0.2,MIT
 mustermann-grape,1.0.0,MIT
 mute-stream,0.0.7,ISC
 mysql2,0.4.10,MIT
-nan,2.8.0,MIT
+nan,2.10.0,MIT
 nanomatch,1.2.9,MIT
 natural-compare,1.4.0,MIT
+needle,2.2.1,MIT
 negotiator,0.6.1,MIT
 neo-async,2.5.0,MIT
 net-ldap,0.16.0,MIT
@@ -1024,7 +1020,7 @@ netrc,0.11.0,MIT
 nice-try,1.0.4,MIT
 node-forge,0.6.33,New BSD
 node-libs-browser,2.1.0,MIT
-node-pre-gyp,0.6.39,New BSD
+node-pre-gyp,0.10.0,New BSD
 node-uuid,1.4.8,MIT
 nodemailer,2.7.2,MIT
 nodemailer-direct-transport,3.3.2,MIT
@@ -1034,7 +1030,8 @@ nodemailer-smtp-pool,2.8.2,MIT
 nodemailer-smtp-transport,2.7.2,MIT
 nodemailer-wellknown,0.1.10,MIT
 nodemon,1.17.3,MIT
-nokogiri,1.8.2,MIT
+nokogiri,1.8.3,MIT
+nokogumbo,1.5.0,Apache 2.0
 nopt,1.0.10,MIT
 nopt,3.0.6,ISC
 nopt,4.0.1,ISC
@@ -1043,6 +1040,8 @@ normalize-path,2.1.1,MIT
 normalize-range,0.1.2,MIT
 normalize-url,1.9.1,MIT
 normalize-url,2.0.1,MIT
+npm-bundled,1.0.3,ISC
+npm-packlist,1.1.10,ISC
 npm-run-path,2.0.2,MIT
 npmlog,4.1.2,ISC
 null-check,1.0.0,MIT
@@ -1076,7 +1075,7 @@ omniauth-oauth,1.1.0,MIT
 omniauth-oauth2,1.5.0,MIT
 omniauth-oauth2-generic,0.2.2,MIT
 omniauth-saml,1.10.0,MIT
-omniauth-shibboleth,1.2.1,MIT
+omniauth-shibboleth,1.3.0,MIT
 omniauth-twitter,1.4.0,MIT
 omniauth_crowd,2.2.3,MIT
 on-finished,2.3.0,MIT
@@ -1137,7 +1136,6 @@ peek-pg,1.3.0,MIT
 peek-rblineprof,0.2.0,MIT
 peek-redis,1.2.0,MIT
 peek-sidekiq,1.0.3,MIT
-performance-now,0.2.0,MIT
 performance-now,2.1.0,MIT
 pg,0.18.4,"BSD,ruby,GPL"
 pify,2.3.0,MIT
@@ -1194,7 +1192,6 @@ premailer-rails,1.9.7,MIT
 prepend-http,1.0.4,MIT
 prepend-http,2.0.0,MIT
 preserve,0.2.0,MIT
-prettier,1.11.1,MIT
 prettier,1.12.1,MIT
 prismjs,1.6.0,MIT
 private,0.1.8,MIT
@@ -1222,7 +1219,6 @@ q,1.4.1,MIT
 q,1.5.0,MIT
 qjobs,1.2.0,MIT
 qs,6.2.3,New BSD
-qs,6.4.0,New BSD
 qs,6.5.1,New BSD
 query-string,4.3.2,MIT
 query-string,5.1.1,MIT
@@ -1303,11 +1299,9 @@ repeat-string,1.6.1,MIT
 repeating,2.0.1,MIT
 representable,3.0.4,MIT
 request,2.75.0,Apache 2.0
-request,2.81.0,Apache 2.0
 request,2.83.0,Apache 2.0
 request_store,1.3.1,MIT
 requestretry,1.13.0,MIT
-require-all,2.2.0,MIT
 require-directory,2.1.1,MIT
 require-main-filename,1.0.1,ISC
 require-uncached,1.0.3,MIT
@@ -1341,24 +1335,26 @@ ruby_parser,3.9.0,MIT
 rubyntlm,0.6.2,MIT
 rubypants,0.2.0,BSD
 rufus-scheduler,3.4.0,MIT
-rugged,0.27.1,MIT
+rugged,0.27.2,MIT
 run-async,2.3.0,MIT
 run-queue,1.0.3,ISC
 rx-lite,4.0.8,Apache 2.0
 rx-lite-aggregates,4.0.8,Apache 2.0
 rxjs,5.5.10,Apache 2.0
 safe-buffer,5.1.1,MIT
+safe-buffer,5.1.2,MIT
 safe-regex,1.1.0,MIT
 safe_yaml,1.0.4,MIT
-sanitize,2.1.0,MIT
+safer-buffer,2.1.2,MIT
+sanitize,4.6.5,MIT
 sanitize-html,1.16.3,MIT
 sass,3.5.5,MIT
 sass-listen,4.0.0,MIT
 sass-rails,5.0.6,MIT
 sawyer,0.8.1,MIT
 sax,1.2.2,ISC
+sax,1.2.4,ISC
 schema-utils,0.4.5,MIT
-securecompare,1.0.0,MIT
 seed-fu,2.3.7,MIT
 select,1.1.2,MIT
 select-hose,2.0.0,MIT
@@ -1433,7 +1429,7 @@ spdy-transport,2.0.20,MIT
 split,0.3.3,MIT
 split-string,3.1.0,MIT
 sprintf-js,1.0.3,New BSD
-sprockets,3.7.1,MIT
+sprockets,3.7.2,MIT
 sprockets-rails,3.2.1,MIT
 sql.js,0.4.0,MIT
 srcset,1.0.0,MIT
@@ -1479,8 +1475,7 @@ sys-filesystem,1.1.6,Artistic 2.0
 table,4.0.2,New BSD
 tapable,0.1.10,MIT
 tapable,1.0.0,MIT
-tar,2.2.1,ISC
-tar-pack,3.4.1,Simplified BSD
+tar,4.4.4,ISC
 temple,0.7.7,MIT
 term-size,1.2.0,MIT
 test-exclude,4.2.1,ISC
@@ -1535,7 +1530,6 @@ uglify-es,3.3.9,Simplified BSD
 uglify-js,2.8.29,Simplified BSD
 uglify-to-browserify,1.0.2,MIT
 uglifyjs-webpack-plugin,1.2.5,MIT
-uid-number,0.0.6,ISC
 ultron,1.1.1,MIT
 undefsafe,2.0.2,MIT
 underscore,1.7.0,MIT
@@ -1566,7 +1560,6 @@ url-parse,1.1.9,MIT
 url-parse-lax,1.0.0,MIT
 url-parse-lax,3.0.0,MIT
 url-to-options,1.0.1,MIT
-url_safe_base64,0.2.2,MIT
 use,2.0.2,MIT
 useragent,2.2.1,MIT
 util,0.10.3,MIT
@@ -1640,6 +1633,7 @@ xtend,4.0.1,MIT
 y18n,3.2.1,ISC
 y18n,4.0.0,ISC
 yallist,2.1.2,ISC
+yallist,3.0.2,ISC
 yargs,11.0.0,MIT
 yargs,11.1.0,MIT
 yargs,3.10.0,MIT

yarn.lock

@@ -5386,9 +5386,9 @@ moment@2.x, moment@^2.18.1:
   version "2.19.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
 
-monaco-editor-webpack-plugin@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.2.1.tgz#577ed091420f422bb8f0ff3a8899dd82344da56d"
+monaco-editor-webpack-plugin@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.4.0.tgz#7324258ab3695464cfe3bc12edb2e8c55b80d92f"
 
 monaco-editor@0.13.1:
   version "0.13.1"