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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

app/assets/javascripts/ide/lib/common/model.js

@@ -14,12 +14,12 @@ export default class Model {
       (this.originalModel = this.monaco.editor.createModel(
         head ? head.content : this.file.raw,
         undefined,
-        new this.monaco.Uri(null, null, `original/${this.file.key}`),
+        new this.monaco.Uri(null, null, `original/${this.path}`),
       )),
       (this.model = this.monaco.editor.createModel(
         this.content,
         undefined,
-        new this.monaco.Uri(null, null, this.file.key),
+        new this.monaco.Uri(null, null, this.path),
       )),
     );
     if (this.file.mrChange) {
@@ -27,7 +27,7 @@ export default class Model {
         (this.baseModel = this.monaco.editor.createModel(
           this.file.baseRaw,
           undefined,
-          new this.monaco.Uri(null, null, `target/${this.file.path}`),
+          new this.monaco.Uri(null, null, `target/${this.path}`),
         )),
       );
     }

app/assets/javascripts/ide/stores/actions/file.js

@@ -196,6 +196,8 @@ export const unstageChange = ({ commit }, path) => {
 };
 
 export const openPendingTab = ({ commit, getters, dispatch, state }, { file, keyPrefix }) => {
+  if (getters.activeFile && getters.activeFile.key === `${keyPrefix}-${file.key}`) return false;
+
   state.openFiles.forEach(f => eventHub.$emit(`editor.update.model.dispose.${f.key}`));
 
   commit(types.ADD_PENDING_TAB, { file, keyPrefix });

app/assets/stylesheets/print.scss

@@ -36,7 +36,9 @@ ul.notes-form,
 .gutter-toggle,
 .issuable-details .content-block-small,
 .edit-link,
-.note-action-button {
+.note-action-button,
+.right-sidebar,
+.flash-container {
   display: none !important;
 }
 
@@ -53,3 +55,7 @@ pre {
 .right-sidebar {
   top: 0;
 }
+
+a[href]::after {
+  content: none !important;
+}

app/models/ci/runner.rb

@@ -59,6 +59,7 @@ module Ci
     validate :tag_constraints
     validate :either_projects_or_group
     validates :access_level, presence: true
+    validates :runner_type, presence: true
 
     acts_as_taggable
 

app/models/clusters/applications/runner.rb

@@ -43,12 +43,20 @@ module Clusters
 
       def create_and_assign_runner
         transaction do
-          project.runners.create!(name: 'kubernetes-cluster', tag_list: %w(kubernetes cluster)).tap do |runner|
+          project.runners.create!(runner_create_params).tap do |runner|
             update!(runner_id: runner.id)
           end
         end
       end
 
+      def runner_create_params
+        {
+          name: 'kubernetes-cluster',
+          runner_type: :project_type,
+          tag_list: %w(kubernetes cluster)
+        }
+      end
+
       def gitlab_url
         Gitlab::Routing.url_helpers.root_url(only_path: false)
       end

app/views/groups/runners/_group_runners.html.haml

-- link = link_to 'Runners API', help_page_path('api/runners.md')
+- link = link_to _('Runners API'), help_page_path('api/runners.md')
 
 %h3
   = _('Group Runners')

app/views/groups/runners/edit.html.haml

-- page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
+- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
 
 %h4 Runner ##{@runner.id}
 

app/views/projects/runners/_group_runners.html.haml

-- link = link_to 'Runners API', help_page_path('api/runners.md')
+- link = link_to _('Runners API'), help_page_path('api/runners.md')
 
 %h3
   = _('Group Runners')
@@ -25,7 +25,7 @@
   = _('This group does not provide any group Runners yet.')
 
   - if can?(current_user, :admin_pipeline, @project.group)
-    - group_link = link_to 'Group CI/CD settings', group_settings_ci_cd_path(@project.group)
+    - group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group)
     = _('Group masters can register group runners in the %{link}').html_safe % { link: group_link }
   - else
     = _('Ask your group master to setup a group Runner.')

app/views/projects/runners/_shared_runners.html.haml

-%h3 Shared Runners
+%h3
+  = _('Shared Runners')
 
 .bs-callout.shared-runners-description
   - if Gitlab::CurrentSettings.shared_runners_text.present?
@@ -17,8 +18,7 @@
     for this project
 
 - if @shared_runners_count.zero?
-  This GitLab instance does not provide any shared Runners yet. Instance
-  administrators can register shared Runners in the admin area.
+  = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')
 - else
   %h4.underlined-title Available shared Runners : #{@shared_runners_count}
   %ul.bordered-list.available-shared-runners

app/views/projects/runners/_specific_runners.html.haml

-%h3 Specific Runners
+%h3
+  = _('Specific Runners')
 
 = render partial: 'ci/runner/how_to_setup_specific_runner',
          locals: { registration_token: @project.runners_token }

app/views/projects/runners/edit.html.haml

-- page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
+- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
 
 %h4 Runner ##{@runner.id}
 

app/views/shared/runners/_form.html.haml

@@ -20,11 +20,11 @@
         %span.light Indicates whether this runner can pick jobs without tags
   - unless runner.group_type?
     .form-group
-      = label :locked, 'Lock to current projects', class: 'control-label'
+      = label :locked, _('Lock to current projects'), class: 'control-label'
       .col-sm-10
         .checkbox
           = f.check_box :locked
-          %span.light When a runner is locked, it cannot be assigned to other projects
+          %span.light= _('When a runner is locked, it cannot be assigned to other projects')
   .form-group
     = label_tag :token, class: 'control-label' do
       Token

app/views/shared/runners/show.html.haml

@@ -21,17 +21,17 @@
         %th Value
     %tr
       %td Active
-      %td= @runner.active? ? 'Yes' : 'No'
+      %td= @runner.active? ? _('Yes') : _('No')
     %tr
       %td Protected
-      %td= @runner.ref_protected? ? 'Yes' : 'No'
+      %td= @runner.ref_protected? ? _('Yes') : _('No')
     %tr
-      %td Can run untagged jobs
-      %td= @runner.run_untagged? ? 'Yes' : 'No'
+      %td= _('Can run untagged jobs')
+      %td= @runner.run_untagged? ? _('Yes') : _('No')
     - unless @runner.group_type?
       %tr
-        %td Locked to this project
-        %td= @runner.locked? ? 'Yes' : 'No'
+        %td= _('Locked to this project')
+        %td= @runner.locked? ? _('Yes') : _('No')
     %tr
       %td Tags
       %td
@@ -60,7 +60,7 @@
       %td Description
       %td= @runner.description
     %tr
-      %td Maximum job timeout
+      %td= _('Maximum job timeout')
       %td= @runner.maximum_timeout_human_readable
     %tr
       %td Last contact

changelogs/unreleased/23465-print-markdown.yml

+---
+title: Fix print styles for markdown pages
+merge_request:
+author:
+type: fixed

changelogs/unreleased/blackst0ne-replace-spinach-project-ff-merge-requests-feature.yml

+---
+title: 'Replace the `project/ff_merge_requests.feature` spinach test with an rspec analog'
+merge_request: 18800
+author: '@blackst0ne'
+type: other

db/migrate/20140313092127_init_schema.rb

 class InitSchema < ActiveRecord::Migration
+  DOWNTIME = true
+
   def up
     create_table "broadcast_messages", force: :cascade do |t|
       t.text "message", null: false

db/migrate/20180508135515_set_runner_type_not_null.rb

+class SetRunnerTypeNotNull < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    change_column_null(:ci_runners, :runner_type, false)
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180508055821) do
+ActiveRecord::Schema.define(version: 20180508135515) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -593,7 +593,7 @@ ActiveRecord::Schema.define(version: 20180508055821) do
     t.integer "access_level", default: 0, null: false
     t.string "ip_address"
     t.integer "maximum_timeout"
-    t.integer "runner_type", limit: 2
+    t.integer "runner_type", limit: 2, null: false
   end
 
   add_index "ci_runners", ["contacted_at"], name: "index_ci_runners_on_contacted_at", using: :btree

doc/ci/examples/container_scanning.md

@@ -23,7 +23,7 @@ container_scanning:
     - docker:stable-dind
   script:
     - docker run -d --name db arminc/clair-db:latest
-    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
+    - docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:v2.0.1
     - apk add -U wget ca-certificates
     - docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
     - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64

doc/ci/runners/README.md

@@ -11,7 +11,7 @@ Ideally, the GitLab Runner should not be installed on the same machine as GitLab
 Read the [requirements documentation](../../install/requirements.md#gitlab-runner)
 for more information.
 
-## Shared vs specific Runners
+## Shared, specific and group Runners
 
 After [installing the Runner][install], you can either register it as shared or
 specific. You can only register a shared Runner if you have admin access to
@@ -32,6 +32,9 @@ are:
   Runners. For example, if you want to deploy a certain project, you can setup
   a specific Runner to have the right credentials for this. The [usage of tags](#using-tags)
   may be useful in this case. Specific Runners process jobs using a [FIFO] queue.
+- **Group Runners** are useful when you have multiple projects under one group
+  and would like all projects to have access to a set of Runners. Group Runners
+  process jobs using a [FIFO] queue.
 
 A Runner that is specific only runs for the specified project(s). A shared Runner
 can run jobs for every project that has enabled the option **Allow shared Runners**
@@ -66,7 +69,7 @@ Runners to disabled.
 
 ## Registering a specific Runner
 
-Registering a specific can be done in two ways:
+Registering a specific Runner can be done in two ways:
 
 1. Creating a Runner with the project registration token
 1. Converting a shared Runner into a specific Runner (one-way, admin only)
@@ -79,6 +82,14 @@ visit the project you want to make the Runner work for in GitLab:
 1. Go to **Settings > CI/CD** to obtain the token
 1. [Register the Runner][register]
 
+## Registering a group Runner
+
+Creating a group Runner requires Master permissions for the group. To create a
+group Runner visit the group you want to make the Runner work for in GitLab:
+
+1. Go to **Settings > CI/CD** to obtain the token
+1. [Register the Runner][register]
+
 ### Making an existing shared Runner specific
 
 If you are an admin on your GitLab instance, you can turn any shared Runner into
@@ -121,7 +132,7 @@ To enable/disable a Runner in your project:
 
 > **Note**:
 Consider that if you don't lock your specific Runner to a specific project, any
-user with Master role in you project can assign your runner to another arbitrary
+user with Master role in you project can assign your Runner to another arbitrary
 project without requiring your authorization, so use it with caution.
 
 An admin can enable/disable a specific Runner for projects:

doc/development/writing_documentation.md

@@ -205,6 +205,19 @@ Things to note:
   built-in help page, that's why we omit it in `git grep`.
 - Use the checklist on the documentation MR description template.
 
+#### Alternative redirection method
+
+Alternatively to the method described above, you can simply replace the content
+of the old file with a frontmatter containing a redirect link:
+
+```yaml
+---
+redirect_to: '../path/to/file/README.md'
+---
+```
+
+It supports both full and relative URLs, e.g. `https://docs.gitlab.com/ee/path/to/file.html`, `../path/to/file.html`, `path/to/file.md`. Note that any `*.md` paths will be compiled to `*.html`.
+
 ### Redirections for pages with Disqus comments
 
 If the documentation page being relocated already has any Disqus comments,

features/project/ff_merge_requests.feature

-Feature: Project Ff Merge Requests
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And merge request "Bug NS-05" is mergeable
-
-  @javascript
-  Scenario: I do ff-only merge for rebased branch
-    Given ff merge enabled
-    And merge request "Bug NS-05" is rebased
-    When I visit merge request page "Bug NS-05"
-    Then I should see ff-only merge button
-    When I accept this merge request
-    Then I should see merged request
-
-  @javascript
-  Scenario: I do ff-only merge for merged branch
-    Given ff merge enabled
-    And merge request "Bug NS-05" merged target
-    When I visit merge request page "Bug NS-05"
-    Then I should see ff-only merge button
-    When I accept this merge request
-    Then I should see merged request
-
-  @javascript
-  Scenario: I do rebase before ff-only merge
-    Given ff merge enabled
-    And rebase before merge enabled
-    When I visit merge request page "Bug NS-05"
-    Then I should see rebase button
-    When I press rebase button
-    Then I should see rebase in progress message
-
-  @javascript
-  Scenario: I do rebase before regular merge
-    Given rebase before merge enabled
-    When I visit merge request page "Bug NS-05"
-    Then I should see rebase button
-    When I press rebase button
-    Then I should see rebase in progress message

features/steps/project/ff_merge_requests.rb

-class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedIssuable
-  include SharedProject
-  include SharedNote
-  include SharedPaths
-  include SharedMarkdown
-  include SharedDiffNote
-  include SharedUser
-  include WaitForRequests
-
-  step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
-    create(:merge_request_with_diffs,
-           title: "Bug NS-05",
-           source_project: project,
-           target_project: project,
-           author: project.users.first)
-  end
-
-  step 'merge request is mergeable' do
-    expect(page).to have_button 'Merge'
-  end
-
-  step 'I should see ff-only merge button' do
-    expect(page).to have_content "Fast-forward merge without a merge commit"
-    expect(page).to have_button 'Merge'
-  end
-
-  step 'merge request "Bug NS-05" is mergeable' do
-    merge_request.mark_as_mergeable
-  end
-
-  step 'I accept this merge request' do
-    page.within '.mr-state-widget' do
-      click_button "Merge"
-    end
-  end
-
-  step 'I should see merged request' do
-    page.within '.status-box' do
-      expect(page).to have_content "Merged"
-      wait_for_requests
-    end
-  end
-
-  step 'ff merge enabled' do
-    project = merge_request.target_project
-    project.merge_requests_ff_only_enabled = true
-    project.save!
-  end
-
-  step 'I should see rebase button' do
-    expect(page).to have_button "Rebase"
-  end
-
-  step 'merge request "Bug NS-05" is rebased' do
-    merge_request.source_branch = 'flatten-dir'
-    merge_request.target_branch = 'improve/awesome'
-    merge_request.reload_diff
-    merge_request.save!
-  end
-
-  step 'merge request "Bug NS-05" merged target' do
-    merge_request.source_branch = 'merged-target'
-    merge_request.target_branch = 'improve/awesome'
-    merge_request.reload_diff
-    merge_request.save!
-  end
-
-  step 'rebase before merge enabled' do
-    project = merge_request.target_project
-    project.merge_requests_rebase_enabled = true
-    project.save!
-  end
-
-  step 'I press rebase button' do
-    click_button "Rebase"
-  end
-
-  step "I should see rebase in progress message" do
-    expect(page).to have_content("Rebase in progress")
-  end
-
-  def merge_request
-    @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
-  end
-end

features/steps/shared/paths.rb

@@ -344,11 +344,6 @@ module SharedPaths
     wait_for_requests
   end
 
-  step 'I visit merge request page "Bug NS-05"' do
-    visit merge_request_path("Bug NS-05")
-    wait_for_requests
-  end
-
   step 'I visit merge request page "Bug NS-07"' do
     visit merge_request_path("Bug NS-07")
     wait_for_requests

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-05-04 17:37+0200\n"
 "PO-Revision-Date: 2018-05-04 17:37+0200\n"
+=======
+"POT-Creation-Date: 2018-05-09 09:24+0200\n"
+"PO-Revision-Date: 2018-05-09 09:24+0200\n"
+>>>>>>> upstream/master
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -143,6 +148,12 @@ msgstr ""
 msgid "+ %{moreCount} more"
 msgstr ""
 
+msgid "- Runner is active and can process any new jobs"
+msgstr ""
+
+msgid "- Runner is paused and will not receive any new jobs"
+msgstr ""
+
 msgid "- show less"
 msgstr ""
 
@@ -195,6 +206,9 @@ msgstr ""
 msgid "<strong>Removes</strong> source branch"
 msgstr ""
 
+msgid "A 'Runner' is a process which runs a job. You can setup as many Runners as you need."
+msgstr ""
+
 msgid "A collection of graphs regarding Continuous Integration"
 msgstr ""
 
@@ -477,10 +491,14 @@ msgstr ""
 msgid "Artifacts"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Ascending"
 msgstr ""
 
 msgid "Assertion consumer service URL"
+=======
+msgid "Ask your group master to setup a group Runner."
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Assign custom color like #FF0000"
@@ -570,6 +588,12 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
+msgid "Available group Runners : %{runners}"
+msgstr ""
+
+msgid "Available group Runners : %{runners}."
+msgstr ""
+
 msgid "Avatar will be removed. Are you sure?"
 msgstr ""
 
@@ -884,7 +908,11 @@ msgstr ""
 msgid "CI/CD configuration"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "CI/CD for external repo"
+=======
+msgid "CI/CD settings"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
@@ -920,6 +948,9 @@ msgstr ""
 msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
 msgstr ""
 
+msgid "Can run untagged jobs"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
@@ -1919,6 +1950,15 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
+<<<<<<< HEAD
+=======
+msgid "Disable for this project"
+msgstr ""
+
+msgid "Disable group Runners"
+msgstr ""
+
+>>>>>>> upstream/master
 msgid "Discard changes"
 msgstr ""
 
@@ -1979,7 +2019,11 @@ msgstr ""
 msgid "Due date"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "During this process, you’ll be asked for URLs from GitLab’s side. Use the URLs shown below."
+=======
+msgid "Each Runner can be in one of the following states:"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Edit"
@@ -2027,7 +2071,14 @@ msgstr ""
 msgid "Enable and configure Prometheus metrics."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Enable classification control using an external service"
+=======
+msgid "Enable for this project"
+msgstr ""
+
+msgid "Enable group Runners"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Enable or disable version check and usage ping."
@@ -2323,7 +2374,14 @@ msgstr ""
 msgid "GeoNodes|Checksummed"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "GeoNodes|Data replication lag:"
+=======
+msgid "GitLab Group Runners can execute code for all the projects in this group."
+msgstr ""
+
+msgid "GitLab Runner section"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodes|Disabling a node stops the sync process. Are you sure?"
@@ -2347,10 +2405,26 @@ msgstr ""
 msgid "GeoNodes|Health status:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "GeoNodes|Last event ID seen from primary:"
 msgstr ""
 
 msgid "GeoNodes|Latest event log status:"
+=======
+msgid "Group CI/CD settings"
+msgstr ""
+
+msgid "Group ID"
+msgstr ""
+
+msgid "Group Runners"
+msgstr ""
+
+msgid "Group masters can register group runners in the %{link}"
+msgstr ""
+
+msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodes|Loading nodes"
@@ -2908,16 +2982,27 @@ msgstr ""
 msgid "Lock %{issuableDisplayName}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Lock not found"
+=======
+msgid "Lock to current projects"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Locked"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Locked Files"
 msgstr ""
 
 msgid "Locks give the ability to lock specific file or folder."
+=======
+msgid "Locked to current projects"
+msgstr ""
+
+msgid "Locked to this project"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Login"
@@ -2956,6 +3041,9 @@ msgstr ""
 msgid "Maximum git storage failures"
 msgstr ""
 
+msgid "Maximum job timeout"
+msgstr ""
+
 msgid "May"
 msgstr ""
 
@@ -3183,7 +3271,11 @@ msgstr ""
 msgid "New tag"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "No Label"
+=======
+msgid "No"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "No assignee"
@@ -3402,6 +3494,9 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+msgid "Pause"
+msgstr ""
+
 msgid "Pending"
 msgstr ""
 
@@ -3942,7 +4037,11 @@ msgstr ""
 msgid "Register / Sign In"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Registry"
+=======
+msgid "Register and see your runners for this group."
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Related Commits"
@@ -3972,6 +4071,12 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
+<<<<<<< HEAD
+=======
+msgid "Remove Runner"
+msgstr ""
+
+>>>>>>> upstream/master
 msgid "Remove avatar"
 msgstr ""
 
@@ -4020,7 +4125,11 @@ msgstr ""
 msgid "Resolve discussion"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Response metrics (Custom)"
+=======
+msgid "Resume"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "Retry"
@@ -4064,6 +4173,15 @@ msgstr ""
 msgid "Runners"
 msgstr ""
 
+msgid "Runners API"
+msgstr ""
+
+msgid "Runners can be placed on separate users, servers, and even on your local machine."
+msgstr ""
+
+msgid "Runners settings"
+msgstr ""
+
 msgid "Running"
 msgstr ""
 
@@ -4238,6 +4356,9 @@ msgstr ""
 msgid "SharedRunnersMinutesSettings|Reset used pipeline minutes"
 msgstr ""
 
+msgid "Shared Runners"
+msgstr ""
+
 msgid "Show command"
 msgstr ""
 
@@ -4429,6 +4550,9 @@ msgstr ""
 msgid "Spam and Anti-bot Protection"
 msgstr ""
 
+msgid "Specific Runners"
+msgstr ""
+
 msgid "Specify the following URL during the Runner setup:"
 msgstr ""
 
@@ -4719,13 +4843,24 @@ msgstr ""
 msgid "There was an error when unsubscribing from this label."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This board\\'s scope is reduced"
+=======
+msgid "They can be managed using the %{link}."
+msgstr ""
+
+msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "This directory"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This group allows you to sign in with your %{group_name} Single Sign-On account. This will redirect you to an external sign in page."
+=======
+msgid "This group does not provide any group Runners yet."
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "This is a confidential issue."
@@ -4785,6 +4920,9 @@ msgstr ""
 msgid "This project"
 msgstr ""
 
+msgid "This project does not belong to a group and can therefore not make use of group Runners."
+msgstr ""
+
 msgid "This repository"
 msgstr ""
 
@@ -4993,10 +5131,14 @@ msgstr ""
 msgid "To import an SVN repository, check out %{svn_link}."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>."
 msgstr ""
 
 msgid "To set up SAML authentication for your group through an identity provider like Azure, Okta, Onelogin, Ping Identity, or your custom SAML 2.0 provider:"
+=======
+msgid "To start serving your jobs you can add Runners to your group"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button."
@@ -5218,6 +5360,7 @@ msgstr ""
 msgid "Web terminal"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
 msgstr ""
 
@@ -5225,6 +5368,9 @@ msgid "Weight"
 msgstr ""
 
 msgid "Weight %{weight}"
+=======
+msgid "When a runner is locked, it cannot be assigned to other projects"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "When enabled, users cannot use GitLab until the terms have been accepted."
@@ -5350,6 +5496,9 @@ msgstr ""
 msgid "Write a commit message..."
 msgstr ""
 
+msgid "Yes"
+msgstr ""
+
 msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
 msgstr ""
 
@@ -5655,7 +5804,11 @@ msgstr ""
 msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "here"
+=======
+msgid "for this project"
+>>>>>>> upstream/master
 msgstr ""
 
 msgid "importing"

spec/factories/ci/runners.rb

@@ -6,6 +6,7 @@ FactoryBot.define do
     is_shared false
     active    true
     access_level :not_protected
+    runner_type :project_type
 
     trait :online do
       contacted_at Time.now
@@ -13,6 +14,7 @@ FactoryBot.define do
 
     trait :shared do
       is_shared true
+      runner_type :instance_type
     end
 
     trait :specific do

spec/factories/merge_requests.rb

@@ -41,6 +41,11 @@ FactoryBot.define do
       state :merged
     end
 
+    trait :merged_target do
+      source_branch "merged-target"
+      target_branch "improve/awesome"
+    end
+
     trait :closed do
       state :closed
     end

spec/features/projects/merge_requests/user_merges_merge_request_spec.rb

+require "spec_helper"
+
+describe "User merges a merge request", :js do
+  let(:user) { project.owner }
+
+  before do
+    sign_in(user)
+  end
+
+  shared_examples "fast forward merge a merge request" do
+    it "merges a merge request" do
+      expect(page).to have_content("Fast-forward merge without a merge commit").and have_button("Merge")
+
+      page.within(".mr-state-widget") do
+        click_button("Merge")
+      end
+
+      page.within(".status-box") do
+        expect(page).to have_content("Merged")
+      end
+    end
+  end
+
+  context "ff-only merge" do
+    let(:project) { create(:project, :public, :repository, merge_requests_ff_only_enabled: true) }
+
+    before do
+      visit(merge_request_path(merge_request))
+    end
+
+    context "when branch is rebased" do
+      let!(:merge_request) { create(:merge_request, :rebased, source_project: project) }
+
+      it_behaves_like "fast forward merge a merge request"
+    end
+
+    context "when branch is merged" do
+      let!(:merge_request) { create(:merge_request, :merged_target, source_project: project) }
+
+      it_behaves_like "fast forward merge a merge request"
+    end
+  end
+end

spec/features/projects/merge_requests/user_rebases_merge_request_spec.rb

+require "spec_helper"
+
+describe "User rebases a merge request", :js do
+  let(:merge_request) { create(:merge_request, :simple, source_project: project) }
+  let(:user) { project.owner }
+
+  before do
+    sign_in(user)
+  end
+
+  shared_examples "rebases" do
+    it "rebases" do
+      visit(merge_request_path(merge_request))
+
+      expect(page).to have_button("Rebase")
+
+      click_button("Rebase")
+
+      expect(page).to have_content("Rebase in progress")
+    end
+  end
+
+  context "when merge is regular" do
+    let(:project) { create(:project, :public, :repository, merge_requests_rebase_enabled: true) }
+
+    it_behaves_like "rebases"
+  end
+
+  context "when merge is ff-only" do
+    let(:project) { create(:project, :public, :repository, merge_requests_ff_only_enabled: true) }
+
+    it_behaves_like "rebases"
+  end
+end

spec/javascripts/ide/lib/common/model_spec.js

@@ -28,6 +28,10 @@ describe('Multi-file editor library model', () => {
     expect(model.originalModel).not.toBeNull();
     expect(model.model).not.toBeNull();
     expect(model.baseModel).not.toBeNull();
+
+    expect(model.originalModel.uri.path).toBe('original/path--path');
+    expect(model.model.uri.path).toBe('path--path');
+    expect(model.baseModel.uri.path).toBe('target/path--path');
   });
 
   it('creates model with head file to compare against', () => {

spec/javascripts/ide/stores/actions/file_spec.js

@@ -569,6 +569,22 @@ describe('IDE store file actions', () => {
         .catch(done.fail);
     });
 
+    it('returns false when already opened', done => {
+      store.state.openFiles.push({
+        ...f,
+        active: true,
+        key: `pending-${f.key}`,
+      });
+
+      store
+        .dispatch('openPendingTab', { file: f, keyPrefix: 'pending' })
+        .then(added => {
+          expect(added).toBe(false);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
     it('pushes router URL when added', done => {
       store.state.currentBranchId = 'master';
 

spec/models/ci/runner_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Ci::Runner do
   describe 'validation' do
     it { is_expected.to validate_presence_of(:access_level) }
+    it { is_expected.to validate_presence_of(:runner_type) }
 
     context 'when runner is not allowed to pick untagged jobs' do
       context 'when runner does not have tags' do

spec/models/clusters/applications/runner_spec.rb

@@ -70,9 +70,8 @@ describe Clusters::Applications::Runner do
 
       it 'assigns the new runner to runner' do
         subject
-        gitlab_runner.reload
 
-        expect(gitlab_runner.runner).not_to be_nil
+        expect(gitlab_runner.reload.runner).to be_project_type
       end
     end
 

vendor/gitignore/Global/JetBrains.gitignore

@@ -4,7 +4,8 @@
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
+.idea/**/dictionaries
+.idea/**/shelf
 
 # Sensitive or high-churn files
 .idea/**/dataSources/

vendor/gitignore/Global/Vim.gitignore

@@ -12,3 +12,5 @@ Session.vim
 *~
 # Auto-generated tag files
 tags
+# Persistent undo
+[._]*.un~

vendor/gitignore/Java.gitignore

@@ -13,6 +13,7 @@
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
 *.zip
 *.tar.gz

vendor/gitignore/Objective-C.gitignore

@@ -52,7 +52,7 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
 
 # Code Injection

vendor/gitignore/Swift.gitignore

@@ -64,5 +64,5 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output

vendor/gitignore/TeX.gitignore

@@ -198,6 +198,9 @@ pythontex-files-*/
 # easy-todo
 *.lod
 
+# xmpincl
+*.xmpi
+
 # xindy
 *.xdy
 
@@ -234,3 +237,6 @@ TSWLatexianTemp*
 
 # standalone packages
 *.sta
+
+# generated if using elsarticle.cls
+*.spl

vendor/gitignore/Unity.gitignore

@@ -6,7 +6,7 @@
 Assets/AssetStoreTools*
 
 # Visual Studio cache directory
-/.vs/
+.vs/
 
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
@@ -22,6 +22,7 @@ ExportedObj/
 *.booproj
 *.svd
 *.pdb
+*.opendb
 
 # Unity3D generated meta files
 *.pidb.meta

vendor/gitignore/VisualStudio.gitignore

@@ -240,6 +240,7 @@ Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf

vendor/gitlab-ci-yml/Chef.gitlab-ci.yml

@@ -7,7 +7,7 @@
 
 image: "chef/chefdk"
 services:
-  - docker:stable-dind
+  - docker:dind
 
 variables:
   DOCKER_HOST: "tcp://docker:2375"

vendor/gitlab-ci-yml/Docker.gitlab-ci.yml

@@ -2,7 +2,7 @@
 image: docker:latest
 
 services:
-  - docker:stable-dind
+  - docker:dind
 
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

vendor/gitlab-ci-yml/Maven.gitlab-ci.yml

@@ -24,7 +24,7 @@ variables:
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
 
 # Cache downloaded dependencies and plugins between builds.
-# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
+# To keep cache across branches add 'key: "$CI_JOB_NAME"'
 cache:
   paths:
     - .m2/repository

vendor/gitlab-ci-yml/Swift.gitlab-ci.yml

 # Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
-# This file assumes an own GitLab CI runner, setup on an OS X system.
+# This file assumes an own GitLab CI runner, setup on an macOS system.
 stages:
   - build
   - archive
@@ -8,11 +8,11 @@ build_project:
   stage: build
   script:
     - xcodebuild clean -project ProjectName.xcodeproj -scheme SchemeName | xcpretty
-    - xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.2' | xcpretty -s
+    - xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.3' | xcpretty -s
   tags:
-    - ios_9-2
-    - xcode_7-2
-    - osx_10-11
+    - ios_11-3
+    - xcode_9-3
+    - macos_10-13
 
 archive_project:
   stage: archive
@@ -25,6 +25,6 @@ archive_project:
     paths:
     - build/ProjectName.ipa
   tags:
-    - ios_9-2
-    - xcode_7-2
-    - osx_10-11
+    - ios_11-3
+    - xcode_9-3
+    - macos_10-13

vendor/licenses.csv

@@ -4,22 +4,19 @@
 @babel/template,7.0.0-beta.32,MIT
 @babel/traverse,7.0.0-beta.32,MIT
 @babel/types,7.0.0-beta.32,MIT
-@gitlab-org/gitlab-svgs,1.17.0,SEE LICENSE IN LICENSE
+@gitlab-org/gitlab-svgs,1.20.0,SEE LICENSE IN LICENSE
+@mrmlnc/readdir-enhanced,2.2.1,MIT
+@sindresorhus/is,0.7.0,MIT
 @types/jquery,2.0.48,MIT
-JSONStream,1.3.2,MIT
 RedCloth,4.3.2,MIT
 abbrev,1.0.9,ISC
 abbrev,1.1.1,ISC
-accepts,1.3.3,MIT
 accepts,1.3.4,MIT
 ace-rails-ap,4.1.2,MIT
 acorn,3.3.0,MIT
-acorn,4.0.13,MIT
-acorn,5.1.1,MIT
 acorn,5.4.1,MIT
-acorn-dynamic-import,2.0.2,MIT
+acorn-dynamic-import,3.0.0,MIT
 acorn-jsx,3.0.1,MIT
-acorn-node,1.3.0,Apache 2.0
 actionmailer,4.2.10,MIT
 actionpack,4.2.10,MIT
 actionview,4.2.10,MIT
@@ -28,14 +25,12 @@ activemodel,4.2.10,MIT
 activerecord,4.2.10,MIT
 activesupport,4.2.10,MIT
 acts-as-taggable-on,5.0.0,MIT
-address,1.0.3,MIT
 addressable,2.5.2,Apache 2.0
 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.2.2,MIT
 ajv,5.5.2,MIT
 ajv,6.1.1,MIT
 ajv-keywords,1.5.1,MIT
@@ -52,8 +47,10 @@ ansi-escapes,3.0.0,MIT
 ansi-html,0.0.7,Apache 2.0
 ansi-regex,2.1.1,MIT
 ansi-regex,3.0.0,MIT
+ansi-styles,1.0.0,MIT
 ansi-styles,2.2.1,MIT
-ansi-styles,3.2.0,MIT
+ansi-styles,3.2.1,MIT
+any-observable,0.2.0,MIT
 anymatch,1.3.2,ISC
 anymatch,2.0.0,ISC
 append-transform,0.4.0,MIT
@@ -65,14 +62,12 @@ arr-diff,2.0.0,MIT
 arr-diff,4.0.0,MIT
 arr-flatten,1.1.0,MIT
 arr-union,3.1.0,MIT
-array-filter,0.0.1,MIT
+array-differ,1.0.0,MIT
 array-find,1.0.0,MIT
 array-find-index,1.0.2,MIT
 array-flatten,1.1.1,MIT
 array-flatten,2.1.1,MIT
 array-includes,3.0.3,MIT
-array-map,0.0.0,MIT
-array-reduce,0.0.0,MIT
 array-slice,0.2.3,MIT
 array-union,1.0.2,MIT
 array-uniq,1.0.3,MIT
@@ -88,11 +83,11 @@ asn1.js,4.10.1,MIT
 assert,1.4.1,MIT
 assert-plus,0.2.0,MIT
 assert-plus,1.0.0,MIT
-asset_sync,2.2.0,MIT
+asset_sync,2.4.0,MIT
 assign-symbols,1.0.0,MIT
+ast-types,0.10.1,MIT
 ast-types,0.11.1,MIT
-astw,2.2.0,MIT
-async,0.9.2,MIT
+ast-types,0.11.3,MIT
 async,1.5.2,MIT
 async,2.1.5,MIT
 async,2.4.1,MIT
@@ -102,7 +97,7 @@ async-limiter,1.0.0,MIT
 asynckit,0.4.0,MIT
 atob,2.0.3,(MIT OR Apache-2.0)
 atomic,1.1.99,Apache 2.0
-attr_encrypted,3.0.3,MIT
+attr_encrypted,3.1.0,MIT
 attr_required,1.0.0,MIT
 autoprefixer,6.7.7,MIT
 autoprefixer-rails,6.2.3,MIT
@@ -115,7 +110,7 @@ axios,0.15.3,MIT
 axios,0.17.1,MIT
 axios-mock-adapter,1.10.0,MIT
 babel-code-frame,6.26.0,MIT
-babel-core,6.26.0,MIT
+babel-core,6.26.3,MIT
 babel-eslint,8.0.2,MIT
 babel-generator,6.26.0,MIT
 babel-helper-bindify-decorators,6.24.1,MIT
@@ -132,20 +127,25 @@ babel-helper-regex,6.26.0,MIT
 babel-helper-remap-async-to-generator,6.24.1,MIT
 babel-helper-replace-supers,6.24.1,MIT
 babel-helpers,6.24.1,MIT
-babel-loader,7.1.2,MIT
+babel-loader,7.1.4,MIT
 babel-messages,6.23.0,MIT
 babel-plugin-check-es2015-constants,6.22.0,MIT
-babel-plugin-istanbul,4.1.5,New BSD
+babel-plugin-istanbul,4.1.6,New BSD
+babel-plugin-rewire,1.1.0,ISC
 babel-plugin-syntax-async-functions,6.13.0,MIT
 babel-plugin-syntax-async-generators,6.13.0,MIT
+babel-plugin-syntax-class-constructor-call,6.18.0,MIT
 babel-plugin-syntax-class-properties,6.13.0,MIT
 babel-plugin-syntax-decorators,6.13.0,MIT
 babel-plugin-syntax-dynamic-import,6.18.0,MIT
 babel-plugin-syntax-exponentiation-operator,6.13.0,MIT
+babel-plugin-syntax-export-extensions,6.13.0,MIT
+babel-plugin-syntax-flow,6.18.0,MIT
 babel-plugin-syntax-object-rest-spread,6.13.0,MIT
 babel-plugin-syntax-trailing-function-commas,6.22.0,MIT
 babel-plugin-transform-async-generator-functions,6.24.1,MIT
 babel-plugin-transform-async-to-generator,6.24.1,MIT
+babel-plugin-transform-class-constructor-call,6.24.1,MIT
 babel-plugin-transform-class-properties,6.24.1,MIT
 babel-plugin-transform-decorators,6.24.1,MIT
 babel-plugin-transform-define,1.3.0,MIT
@@ -172,6 +172,8 @@ babel-plugin-transform-es2015-template-literals,6.22.0,MIT
 babel-plugin-transform-es2015-typeof-symbol,6.23.0,MIT
 babel-plugin-transform-es2015-unicode-regex,6.24.1,MIT
 babel-plugin-transform-exponentiation-operator,6.24.1,MIT
+babel-plugin-transform-export-extensions,6.22.0,MIT
+babel-plugin-transform-flow-strip-types,6.22.0,MIT
 babel-plugin-transform-object-rest-spread,6.23.0,MIT
 babel-plugin-transform-regenerator,6.26.0,MIT
 babel-plugin-transform-strict-mode,6.24.1,MIT
@@ -179,6 +181,7 @@ babel-preset-es2015,6.24.1,MIT
 babel-preset-es2016,6.24.1,MIT
 babel-preset-es2017,6.24.1,MIT
 babel-preset-latest,6.24.1,MIT
+babel-preset-stage-1,6.24.1,MIT
 babel-preset-stage-2,6.24.1,MIT
 babel-preset-stage-3,6.24.1,MIT
 babel-register,6.26.0,MIT
@@ -189,6 +192,7 @@ babel-types,6.26.0,MIT
 babosa,1.0.2,MIT
 babylon,6.18.0,MIT
 babylon,7.0.0-beta.32,MIT
+babylon,7.0.0-beta.44,MIT
 backo2,1.0.2,MIT
 balanced-match,0.4.2,MIT
 balanced-match,1.0.0,MIT
@@ -206,13 +210,13 @@ better-assert,1.0.2,MIT
 bfj-node4,5.2.1,MIT
 big.js,3.1.3,MIT
 binary-extensions,1.11.0,MIT
+binaryextensions,2.1.1,MIT
 bindata,2.4.3,ruby
 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.0,MIT
 bluebird,3.5.1,MIT
 bn.js,4.11.8,MIT
 body-parser,1.18.2,MIT
@@ -224,25 +228,19 @@ bootstrap-sass,3.3.6,MIT
 bootstrap_form,2.7.0,MIT
 boxen,1.3.0,MIT
 brace-expansion,1.1.11,MIT
-brace-expansion,1.1.8,MIT
 braces,0.1.5,MIT
 braces,1.8.5,MIT
 braces,2.3.1,MIT
 brorand,1.1.0,MIT
 browser,2.2.0,MIT
-browser-pack,6.0.4,MIT
-browser-resolve,1.11.2,MIT
-browserify,14.5.0,MIT
 browserify-aes,1.1.1,MIT
 browserify-cipher,1.0.0,MIT
 browserify-des,1.0.0,MIT
 browserify-rsa,4.0.1,MIT
 browserify-sign,4.0.4,ISC
 browserify-zlib,0.1.4,MIT
-browserify-zlib,0.2.0,MIT
 browserslist,1.7.7,MIT
 buffer,4.9.1,MIT
-buffer,5.1.0,MIT
 buffer-indexof,1.1.0,MIT
 buffer-more-ints,0.0.2,MIT
 buffer-xor,1.0.3,MIT
@@ -254,13 +252,13 @@ bytes,2.5.0,MIT
 bytes,3.0.0,MIT
 cacache,10.0.4,ISC
 cache-base,1.0.1,MIT
-cached-path-relative,1.0.1,MIT
+cacheable-request,2.1.4,MIT
+call-me-maybe,1.0.1,MIT
 caller-path,0.1.0,MIT
 callsite,1.0.0,MIT*
 callsites,0.2.0,MIT
 camelcase,1.2.1,MIT
 camelcase,2.1.1,MIT
-camelcase,3.0.0,MIT
 camelcase,4.1.0,MIT
 camelcase-keys,2.1.0,MIT
 caniuse-api,1.6.1,MIT
@@ -271,16 +269,19 @@ caseless,0.11.0,Apache 2.0
 caseless,0.12.0,Apache 2.0
 cause,0.1,MIT
 center-align,0.1.3,MIT
+chalk,0.4.0,MIT
 chalk,1.1.3,MIT
-chalk,2.3.0,MIT
-chalk,2.3.1,MIT
+chalk,2.4.0,MIT
+chalk,2.4.1,MIT
 chardet,0.4.2,MIT
+charenc,0.0.2,New BSD
 charlock_holmes,0.7.6,MIT
 chart.js,1.0.2,MIT
 check-types,7.3.0,MIT
 chokidar,1.7.0,MIT
 chokidar,2.0.2,MIT
 chownr,1.0.1,ISC
+chrome-trace-event,0.1.2,MIT
 chronic,0.10.2,MIT
 chronic_duration,0.10.6,MIT
 chunky_png,1.3.5,MIT
@@ -294,11 +295,21 @@ classlist-polyfill,1.2.0,Unlicense
 cli-boxes,1.0.0,MIT
 cli-cursor,1.0.2,MIT
 cli-cursor,2.1.0,MIT
+cli-spinners,0.1.2,MIT
+cli-table,0.3.1,MIT
+cli-truncate,0.2.1,MIT
 cli-width,2.1.0,ISC
 clipboard,1.7.1,MIT
 cliui,2.1.0,ISC
-cliui,3.2.0,ISC
+cliui,4.0.0,ISC
 clone,1.0.2,MIT
+clone,1.0.3,MIT
+clone,2.1.1,MIT
+clone-buffer,1.0.0,MIT
+clone-response,1.0.2,MIT
+clone-stats,0.0.1,MIT
+clone-stats,1.0.0,MIT
+cloneable-readable,1.0.0,MIT
 co,3.0.6,MIT
 co,4.6.0,MIT
 coa,1.0.1,MIT
@@ -310,11 +321,11 @@ color-convert,1.9.1,MIT
 color-name,1.1.2,MIT
 color-string,0.3.0,MIT
 colormin,1.1.2,MIT
+colors,1.0.3,MIT
 colors,1.1.2,MIT
 combine-lists,1.0.1,MIT
-combine-source-map,0.7.2,MIT
-combine-source-map,0.8.0,MIT
 combined-stream,1.0.6,MIT
+commander,2.13.0,MIT
 commander,2.15.1,MIT
 commondir,1.0.1,MIT
 commonmarker,0.17.8,MIT
@@ -323,9 +334,8 @@ component-emitter,1.2.1,MIT
 component-inherit,0.0.3,MIT*
 compressible,2.0.11,MIT
 compression,1.7.0,MIT
-compression-webpack-plugin,1.1.7,MIT
+compression-webpack-plugin,1.1.11,MIT
 concat-map,0.0.1,MIT
-concat-stream,1.5.2,MIT
 concat-stream,1.6.0,MIT
 concurrent-ruby-ext,1.0.5,MIT
 configstore,3.1.1,Simplified BSD
@@ -339,21 +349,18 @@ constants-browserify,1.0.0,MIT
 contains-path,0.1.0,MIT
 content-disposition,0.5.2,MIT
 content-type,1.0.4,MIT
-convert-source-map,1.1.3,MIT
-convert-source-map,1.5.0,MIT
+convert-source-map,1.5.1,MIT
 cookie,0.3.1,MIT
 cookie-signature,1.0.6,MIT
 copy-concurrently,1.0.5,ISC
 copy-descriptor,0.1.1,MIT
-copy-webpack-plugin,4.4.1,MIT
+copy-webpack-plugin,4.5.1,MIT
 core-js,2.3.0,MIT
-core-js,2.4.1,MIT
-core-js,2.5.1,MIT
 core-js,2.5.3,MIT
 core-util-is,1.0.2,MIT
-cosmiconfig,2.1.1,MIT
+cosmiconfig,2.2.2,MIT
 crack,0.4.3,MIT
-crass,1.0.3,MIT
+crass,1.0.4,MIT
 create-ecdh,4.0.0,MIT
 create-error-class,3.0.2,MIT
 create-hash,1.1.3,MIT
@@ -361,13 +368,14 @@ create-hmac,1.1.6,MIT
 creole,0.5.0,ruby
 cropper,2.3.0,MIT
 cross-spawn,5.1.0,MIT
+cross-spawn,6.0.5,MIT
+crypt,0.0.2,New BSD
 cryptiles,2.0.5,New BSD
 cryptiles,3.1.2,New BSD
-crypto-browserify,3.11.0,MIT
 crypto-browserify,3.12.0,MIT
 crypto-random-string,1.0.0,MIT
 css-color-names,0.0.4,MIT
-css-loader,0.28.9,MIT
+css-loader,0.28.11,MIT
 css-selector-tokenizer,0.7.0,MIT
 css_parser,1.5.0,MIT
 cssesc,0.1.0,MIT
@@ -400,10 +408,13 @@ d3-transition,1.1.1,New BSD
 d3_rails,3.5.11,MIT
 dagre-d3-renderer,0.4.24,MIT
 dagre-layout,0.8.0,MIT
+dargs,5.1.0,MIT
 dashdash,1.14.1,MIT
 data-uri-to-buffer,1.2.0,MIT
+date-fns,1.29.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
@@ -418,6 +429,7 @@ decode-uri-component,0.2.0,MIT
 decompress-response,3.3.0,MIT
 deep-equal,1.0.1,MIT
 deep-extend,0.4.2,MIT
+deep-extend,0.5.1,MIT
 deep-is,0.1.3,MIT
 default-require-extensions,1.0.0,MIT
 default_value_for,3.0.2,MIT
@@ -433,19 +445,19 @@ delayed-stream,1.0.0,MIT
 delegate,3.1.2,MIT
 delegates,1.0.0,MIT
 depd,1.1.1,MIT
-deps-sort,2.0.0,MIT
 des.js,1.0.0,MIT
 descendants_tracker,0.0.4,MIT
 destroy,1.0.4,MIT
+detect-conflict,1.0.1,MIT
 detect-indent,4.0.0,MIT
 detect-libc,1.0.3,Apache 2.0
 detect-node,2.0.3,ISC
-detect-port-alt,1.1.5,MIT
-detective,4.7.1,MIT
-devise,4.2.0,MIT
+device_detector,1.0.0,LGPL
+devise,4.4.3,MIT
 devise-two-factor,3.0.0,MIT
 di,0.0.1,MIT
 diff,3.4.0,New BSD
+diff,3.5.0,New BSD
 diff-lcs,1.3,"MIT,Artistic-2.0,GPL-2.0+"
 diffie-hellman,5.0.2,MIT
 diffy,3.1.0,MIT
@@ -464,38 +476,43 @@ domelementtype,1.1.3,Simplified BSD
 domelementtype,1.3.0,Simplified BSD
 domhandler,2.4.1,Simplified BSD
 domutils,1.6.2,Simplified BSD
-doorkeeper,4.3.1,MIT
+doorkeeper,4.3.2,MIT
 doorkeeper-openid_connect,1.3.0,MIT
 dot-prop,4.2.0,MIT
 double-ended-queue,2.1.0-0,MIT
 dropzone,4.2.0,MIT
 dropzonejs-rails,0.7.2,MIT
 duplexer,0.1.1,MIT
-duplexer2,0.1.4,New BSD
 duplexer3,0.1.4,New BSD
 duplexify,3.5.3,MIT
 ecc-jsbn,0.1.1,MIT
+editions,1.3.4,MIT
 ee-first,1.1.1,MIT
 ejs,2.5.7,Apache 2.0
+ejs,2.5.9,Apache 2.0
 electron-to-chromium,1.3.3,ISC
+elegant-spinner,1.0.1,MIT
 elliptic,6.4.0,MIT
 email_reply_trimmer,0.1.6,MIT
 emoji-unicode-version,0.2.1,MIT
 emojis-list,2.1.0,MIT
 encodeurl,1.0.2,MIT
 encryptor,3.0.0,MIT
-end-of-stream,1.4.0,MIT
 end-of-stream,1.4.1,MIT
 engine.io,3.1.5,MIT
 engine.io-client,3.1.5,MIT
 engine.io-parser,2.1.2,MIT
 enhanced-resolve,0.9.1,MIT
-enhanced-resolve,3.4.1,MIT
+enhanced-resolve,4.0.0,MIT
 ent,2.2.0,MIT
 entities,1.1.1,Simplified BSD
+envinfo,4.4.2,MIT
 equalizer,0.0.11,MIT
 errno,0.1.4,MIT
+errno,0.1.7,MIT
+error,7.0.2,MIT
 error-ex,1.3.0,MIT
+error-ex,1.3.1,MIT
 erubis,2.7.0,MIT
 es-abstract,1.10.0,MIT
 es-to-primitive,1.1.1,MIT
@@ -525,7 +542,6 @@ eslint-plugin-promise,3.5.0,ISC
 eslint-plugin-vue,4.0.1,MIT
 eslint-scope,3.7.1,Simplified BSD
 eslint-visitor-keys,1.0.0,Apache 2.0
-espree,3.5.0,Simplified BSD
 espree,3.5.2,Simplified BSD
 esprima,2.7.3,Simplified BSD
 esprima,3.1.3,Simplified BSD
@@ -545,7 +561,7 @@ eventemitter3,1.2.0,MIT
 events,1.1.1,MIT
 eventsource,0.1.6,MIT
 evp_bytestokey,1.0.3,MIT
-excon,0.60.0,MIT
+excon,0.62.0,MIT
 execa,0.7.0,MIT
 execjs,2.6.0,MIT
 exit-hook,1.1.1,MIT
@@ -562,14 +578,16 @@ extend,3.0.1,MIT
 extend-shallow,2.0.1,MIT
 extend-shallow,3.0.2,MIT
 external-editor,2.1.0,MIT
+external-editor,2.2.0,MIT
 extglob,0.3.2,MIT
 extglob,2.0.4,MIT
 extsprintf,1.3.0,MIT
 extsprintf,1.4.0,MIT
 faraday,0.12.2,MIT
-faraday_middleware,0.11.0.1,MIT
+faraday_middleware,0.12.2,MIT
 faraday_middleware-multi_json,0.0.6,MIT
 fast-deep-equal,1.0.0,MIT
+fast-glob,2.2.1,MIT
 fast-json-stable-stringify,2.0.0,MIT
 fast-levenshtein,2.0.6,MIT
 fast_blank,1.0.0,MIT
@@ -581,11 +599,10 @@ ffi,1.9.18,New BSD
 figures,1.7.0,MIT
 figures,2.0.0,MIT
 file-entry-cache,2.0.0,MIT
-file-loader,1.1.8,MIT
+file-loader,1.1.11,MIT
 file-uri-to-path,1.0.0,MIT
 filename-regex,2.0.1,MIT
 fileset,2.0.3,MIT
-filesize,3.5.11,New BSD
 filesize,3.6.0,New BSD
 fill-range,2.2.3,MIT
 fill-range,4.0.0,MIT
@@ -594,11 +611,13 @@ find-cache-dir,1.0.0,MIT
 find-root,0.1.2,MIT
 find-up,1.1.2,MIT
 find-up,2.1.0,MIT
+first-chunk-stream,2.0.0,MIT
 flat-cache,1.2.2,MIT
 flatten,1.0.2,MIT
 flipper,0.13.0,MIT
 flipper-active_record,0.13.0,MIT
 flipper-active_support_cache_store,0.13.0,MIT
+flow-parser,0.66.0,MIT
 flowdock,0.7.1,MIT
 flush-write-stream,1.0.2,MIT
 fog-aliyun,0.2.0,MIT
@@ -649,19 +668,25 @@ 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.94.0,MIT
+gh-got,6.0.0,MIT
+gitaly-proto,0.99.0,MIT
 github-linguist,5.3.3,MIT
-github-markup,1.6.1,MIT
+github-markup,1.7.0,MIT
+github-username,4.1.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-grit,2.8.2,MIT
 gitlab-markup,1.6.3,MIT
 gitlab_omniauth-ldap,2.0.4,MIT
 glob,5.0.15,ISC
 glob,7.1.1,ISC
 glob,7.1.2,ISC
+glob-all,3.1.0,MIT
 glob-base,0.3.0,MIT
 glob-parent,2.0.0,ISC
 glob-parent,3.1.0,ISC
+glob-to-regexp,0.3.0,BSD
 global-dirs,0.1.1,MIT
 global-modules,1.0.0,MIT
 global-prefix,1.0.2,MIT
@@ -671,10 +696,8 @@ globals,9.18.0,MIT
 globby,5.0.0,MIT
 globby,6.1.0,MIT
 globby,7.1.1,MIT
-goldiloader,2.0.1,MIT
+globby,8.0.1,MIT
 gollum-grit_adapter,1.0.1,MIT
-gollum-lib,4.2.7,MIT
-gollum-rugged_adapter,0.4.4,MIT
 gon,6.1.0,MIT
 good-listener,1.2.2,MIT
 google-api-client,0.19.8,Apache 2.0
@@ -683,15 +706,16 @@ googleapis-common-protos-types,1.0.1,Apache 2.0
 googleauth,0.6.2,Apache 2.0
 got,6.7.1,MIT
 got,7.1.0,MIT
+got,8.3.0,MIT
 gpgme,2.0.13,LGPL-2.1+
 graceful-fs,4.1.11,ISC
 grape,1.0.2,MIT
-grape-entity,0.6.0,MIT
+grape-entity,0.7.1,MIT
 grape-route-helpers,2.1.0,MIT
 grape_logging,1.7.0,MIT
 graphlib,2.1.1,MIT
-grpc,1.10.0,Apache 2.0
-gzip-size,3.0.0,MIT
+grouped-queue,0.3.3,MIT
+grpc,1.11.0,Apache 2.0
 gzip-size,4.1.0,MIT
 hamlit,2.6.1,MIT
 handle-thing,1.2.5,MIT
@@ -704,6 +728,7 @@ har-validator,5.0.3,ISC
 has,1.0.1,MIT
 has-ansi,2.0.0,MIT
 has-binary2,1.0.2,MIT
+has-color,0.1.7,MIT
 has-cors,1.1.0,MIT
 has-flag,1.0.0,MIT
 has-flag,2.0.0,MIT
@@ -739,16 +764,16 @@ html-entities,1.2.0,MIT
 html-pipeline,2.7.1,MIT
 html2text,0.2.0,MIT
 htmlentities,4.3.4,MIT
-htmlescape,1.1.1,MIT
 htmlparser2,3.9.2,MIT
 http,2.2.2,MIT
+http-cache-semantics,3.8.1,Simplified BSD
 http-cookie,1.0.3,MIT
 http-deceiver,1.2.7,MIT
 http-errors,1.6.2,MIT
 http-form_data,1.0.3,MIT
 http-proxy,1.16.2,MIT
 http-proxy-agent,1.0.0,MIT
-http-proxy-middleware,0.17.4,MIT
+http-proxy-middleware,0.18.0,MIT
 http-signature,1.1.1,MIT
 http-signature,1.2.0,MIT
 http_parser.rb,0.6.0,MIT
@@ -757,7 +782,6 @@ httpclient,2.8.3,ruby
 httpntlm,1.6.1,MIT
 httpreq,0.4.24,MIT
 https-browserify,0.0.1,MIT
-https-browserify,1.0.0,MIT
 https-proxy-agent,1.0.0,MIT
 i18n,0.9.5,MIT
 ice_nine,0.11.2,MIT
@@ -767,7 +791,6 @@ icss-replace-symbols,1.1.0,ISC
 icss-utils,2.1.0,ISC
 ieee754,1.1.8,New BSD
 iferr,0.1.5,MIT
-ignore,3.3.3,MIT
 ignore,3.3.7,MIT
 ignore-by-default,1.0.1,ISC
 immediate,3.0.6,MIT
@@ -776,6 +799,7 @@ import-local,1.0.0,MIT
 imports-loader,0.8.0,MIT
 imurmurhash,0.1.4,MIT
 indent-string,2.1.0,MIT
+indent-string,3.2.0,MIT
 indexes-of,1.0.1,MIT
 indexof,0.0.1,MIT*
 inflection,1.10.0,MIT
@@ -785,12 +809,13 @@ influxdb,0.2.3,MIT
 inherits,2.0.1,ISC
 inherits,2.0.3,ISC
 ini,1.3.5,ISC
-inline-source-map,0.6.2,MIT
 inquirer,0.12.0,MIT
 inquirer,3.3.0,MIT
-insert-module-globals,7.0.1,MIT
+inquirer,5.2.0,MIT
 internal-ip,1.2.0,MIT
 interpret,1.0.1,MIT
+interpret,1.1.0,MIT
+into-stream,3.1.0,MIT
 invariant,2.2.2,New BSD
 invert-kv,1.0.0,MIT
 ip,1.0.1,MIT
@@ -803,7 +828,6 @@ is-accessor-descriptor,0.1.6,MIT
 is-accessor-descriptor,1.0.0,MIT
 is-arrayish,0.2.1,MIT
 is-binary-path,1.0.1,MIT
-is-buffer,1.1.5,MIT
 is-buffer,1.1.6,MIT
 is-builtin-module,1.0.0,MIT
 is-callable,1.1.3,MIT
@@ -812,6 +836,7 @@ is-data-descriptor,1.0.0,MIT
 is-date-object,1.0.1,MIT
 is-descriptor,0.1.6,MIT
 is-descriptor,1.0.2,MIT
+is-directory,0.3.1,MIT
 is-dotfile,1.0.3,MIT
 is-equal-shallow,0.1.3,MIT
 is-extendable,0.1.1,MIT
@@ -826,7 +851,6 @@ is-glob,3.1.0,MIT
 is-glob,4.0.0,MIT
 is-installed-globally,0.1.0,MIT
 is-my-ip-valid,1.0.0,MIT
-is-my-json-valid,2.16.0,MIT
 is-my-json-valid,2.17.2,MIT
 is-npm,1.0.0,MIT
 is-number,0.1.1,MIT
@@ -835,6 +859,7 @@ is-number,3.0.0,MIT
 is-number,4.0.0,MIT
 is-obj,1.0.1,MIT
 is-object,1.0.1,MIT
+is-observable,0.2.0,MIT
 is-odd,2.0.0,MIT
 is-path-cwd,1.0.0,MIT
 is-path-in-cwd,1.0.0,MIT
@@ -850,7 +875,7 @@ is-regex,1.0.4,MIT
 is-relative,0.2.1,MIT
 is-resolvable,1.0.0,MIT
 is-retry-allowed,1.1.0,MIT
-is-root,1.0.0,MIT
+is-scoped,1.0.0,MIT
 is-stream,1.1.0,MIT
 is-svg,2.1.0,MIT
 is-symbol,1.0.1,MIT
@@ -864,7 +889,6 @@ isarray,0.0.1,MIT
 isarray,1.0.0,MIT
 isarray,2.0.1,MIT
 isbinaryfile,3.0.2,MIT
-isexe,1.1.2,ISC
 isexe,2.0.0,ISC
 isobject,2.1.0,MIT
 isobject,3.0.1,MIT
@@ -872,11 +896,14 @@ isstream,0.1.2,MIT
 istanbul,0.4.5,New BSD
 istanbul-api,1.2.1,New BSD
 istanbul-lib-coverage,1.1.1,New BSD
+istanbul-lib-coverage,1.2.0,New BSD
 istanbul-lib-hook,1.1.0,New BSD
+istanbul-lib-instrument,1.10.1,New BSD
 istanbul-lib-instrument,1.9.1,New BSD
 istanbul-lib-report,1.1.2,New BSD
 istanbul-lib-source-maps,1.2.2,New BSD
 istanbul-reports,1.1.3,New BSD
+istextorbinary,2.2.1,MIT
 isurl,1.0.0,MIT
 jasmine-core,2.9.0,MIT
 jasmine-jquery,2.1.1,MIT
@@ -889,23 +916,25 @@ jquery.waitforimages,2.2.0,MIT
 js-base64,2.1.9,New BSD
 js-cookie,2.1.3,MIT
 js-tokens,3.0.2,MIT
+js-yaml,3.11.0,MIT
 js-yaml,3.7.0,MIT
 js-yaml,3.9.1,MIT
 jsbn,0.1.1,MIT
+jscodeshift,0.4.1,New BSD
+jscodeshift,0.5.0,New BSD
 jsesc,0.5.0,MIT
 jsesc,1.3.0,MIT
 json,1.8.6,ruby
+json-buffer,3.0.0,MIT
 json-jwt,1.9.2,MIT
-json-loader,0.5.7,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,0.0.1,MIT
 json-stable-stringify,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
-jsonparse,1.3.1,MIT
 jsonpointer,4.0.1,MIT
 jsprim,1.4.1,MIT
 jszip,3.1.3,(MIT OR GPL-3.0)
@@ -915,14 +944,15 @@ kaminari,1.0.1,MIT
 kaminari-actionview,1.0.1,MIT
 kaminari-activerecord,1.0.1,MIT
 kaminari-core,1.0.1,MIT
-karma,2.0.0,MIT
+karma,2.0.2,MIT
 karma-chrome-launcher,2.2.0,MIT
-karma-coverage-istanbul-reporter,1.4.1,MIT
+karma-coverage-istanbul-reporter,1.4.2,MIT
 karma-jasmine,1.1.1,MIT
 karma-mocha-reporter,2.2.5,MIT
 karma-sourcemap-loader,0.3.7,MIT
-karma-webpack,2.0.7,MIT
+karma-webpack,3.0.0,MIT
 katex,0.8.3,MIT
+keyv,3.0.0,MIT
 kgio,2.10.0,LGPL-2.1+
 killable,1.0.0,ISC
 kind-of,3.2.2,MIT
@@ -930,27 +960,28 @@ kind-of,4.0.0,MIT
 kind-of,5.1.0,MIT
 kind-of,6.0.2,MIT
 kubeclient,3.0.0,MIT
-labeled-stream-splicer,2.0.0,MIT
 latest-version,3.1.0,MIT
 lazy-cache,1.0.4,MIT
 lazy-cache,2.0.2,MIT
 lcid,1.0.0,MIT
 levn,0.3.0,MIT
-lexical-scope,1.2.0,MIT
 libbase64,0.1.0,MIT
 libmime,3.0.0,MIT
 libqp,1.1.0,MIT
 licensee,8.9.2,MIT
 lie,3.1.1,MIT
+listr,0.13.0,MIT
+listr-silent-renderer,1.1.1,MIT
+listr-update-renderer,0.4.0,MIT
+listr-verbose-renderer,0.4.1,MIT
 little-plugger,1.1.4,MIT
 load-json-file,1.1.0,MIT
-load-json-file,2.0.0,MIT
+load-json-file,4.0.0,MIT
 loader-runner,2.3.0,MIT
-loader-utils,0.2.16,MIT
 loader-utils,1.1.0,MIT
 locale,2.1.2,"ruby,LGPLv3+"
 locate-path,2.0.0,MIT
-lodash,3.10.1,MIT
+lodash,4.17.10,MIT
 lodash,4.17.4,MIT
 lodash,4.17.5,MIT
 lodash._baseget,3.7.2,MIT
@@ -968,24 +999,28 @@ lodash.isarray,3.0.4,MIT
 lodash.isfunction,3.0.9,MIT
 lodash.isstring,4.0.1,MIT
 lodash.kebabcase,4.0.1,MIT
-lodash.memoize,3.0.4,MIT
 lodash.memoize,4.1.2,MIT
 lodash.mergewith,4.6.0,MIT
 lodash.snakecase,4.0.1,MIT
 lodash.startswith,4.2.1,MIT
 lodash.uniq,4.5.0,MIT
 lodash.words,4.2.0,MIT
+log-symbols,1.0.2,MIT
 log-symbols,2.1.0,MIT
+log-symbols,2.2.0,MIT
+log-update,1.0.2,MIT
 log4js,2.5.3,Apache 2.0
 logging,2.2.2,MIT
 loggly,1.1.1,MIT
 loglevel,1.4.1,MIT
-lograge,0.5.1,MIT
+loglevelnext,1.0.3,MIT
+lograge,0.10.0,MIT
 longest,1.0.1,MIT
 loofah,2.2.2,MIT
 loose-envify,1.3.1,MIT
 loud-rejection,1.6.0,MIT
 lowercase-keys,1.0.0,MIT
+lru-cache,2.2.4,MIT
 lru-cache,2.6.5,ISC
 lru-cache,4.1.1,ISC
 macaddress,0.2.8,MIT
@@ -994,6 +1029,7 @@ mail_room,0.9.1,MIT
 mailcomposer,4.0.1,MIT
 mailgun-js,0.7.15,MIT
 make-dir,1.0.0,MIT
+make-dir,1.2.0,MIT
 map-cache,0.2.2,MIT
 map-obj,1.0.1,MIT
 map-stream,0.1.0,UNKNOWN
@@ -1004,19 +1040,25 @@ math-expression-evaluator,1.2.16,MIT
 md5.js,1.3.4,MIT
 media-typer,0.3.0,MIT
 mem,1.1.0,MIT
+mem-fs,1.1.3,MIT
+mem-fs-editor,4.0.1,MIT
 memoist,0.16.0,MIT
 memory-fs,0.2.0,MIT
 memory-fs,0.4.1,MIT
 meow,3.7.0,MIT
 merge-descriptors,1.0.1,MIT
+merge2,1.2.2,MIT
 method_source,0.8.2,MIT
 methods,1.1.2,MIT
 micromatch,2.3.11,MIT
+micromatch,3.1.10,MIT
 micromatch,3.1.6,MIT
+micromatch,3.1.9,MIT
 miller-rabin,4.0.1,MIT
 mime,1.4.1,MIT
 mime,1.6.0,MIT
-mime-db,1.29.0,MIT
+mime,2.2.0,MIT
+mime,2.3.1,MIT
 mime-db,1.33.0,MIT
 mime-types,2.1.18,MIT
 mime-types,3.1,MIT
@@ -1028,15 +1070,14 @@ mini_mime,1.0.0,MIT
 mini_portile2,2.3.0,MIT
 minimalistic-assert,1.0.0,ISC
 minimalistic-crypto-utils,1.0.1,MIT
-minimatch,3.0.3,ISC
 minimatch,3.0.4,ISC
 minimist,0.0.10,MIT
 minimist,0.0.8,MIT
+minimist,0.1.0,MIT
 minimist,1.2.0,MIT
 mississippi,2.0.0,Simplified BSD
 mixin-deep,1.3.1,MIT
 mkdirp,0.5.1,MIT
-module-deps,4.1.1,MIT
 moment,2.19.2,MIT
 monaco-editor,0.10.0,MIT
 mousetrap,1.4.6,Apache 2.0
@@ -1048,21 +1089,24 @@ multi_json,1.13.1,MIT
 multi_xml,0.6.0,MIT
 multicast-dns,6.1.1,MIT
 multicast-dns-service-types,1.1.0,MIT
+multimatch,2.1.0,MIT
 multipart-post,2.0.0,MIT
 mustermann,1.0.2,MIT
 mustermann-grape,1.0.0,MIT
 mute-stream,0.0.5,ISC
 mute-stream,0.0.7,ISC
 mysql2,0.4.10,MIT
-name-all-modules-plugin,1.0.1,MIT
 nan,2.8.0,MIT
 nanomatch,1.2.9,MIT
 natural-compare,1.4.0,MIT
 negotiator,0.6.1,MIT
+neo-async,2.5.0,MIT
 net-ldap,0.16.0,MIT
 net-ssh,4.2.0,MIT
 netmask,1.0.6,MIT
 netrc,0.11.0,MIT
+nice-try,1.0.4,MIT
+node-dir,0.1.8,MIT
 node-forge,0.6.33,New BSD
 node-libs-browser,1.1.1,MIT
 node-libs-browser,2.0.0,MIT
@@ -1075,8 +1119,9 @@ nodemailer-shared,1.1.0,MIT
 nodemailer-smtp-pool,2.8.2,MIT
 nodemailer-smtp-transport,2.7.2,MIT
 nodemailer-wellknown,0.1.10,MIT
-nodemon,1.15.1,MIT
+nodemon,1.17.3,MIT
 nokogiri,1.8.2,MIT
+nomnom,1.8.1,MIT
 nopt,1.0.10,MIT
 nopt,3.0.6,ISC
 nopt,4.0.1,ISC
@@ -1084,6 +1129,7 @@ normalize-package-data,2.4.0,Simplified BSD
 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-run-path,2.0.2,MIT
 npmlog,4.1.2,ISC
 null-check,1.0.0,MIT
@@ -1108,10 +1154,9 @@ omniauth-authentiq,0.3.1,MIT
 omniauth-azure-oauth2,0.0.9,MIT
 omniauth-cas3,1.1.4,MIT
 omniauth-facebook,4.0.0,MIT
-omniauth-github,1.1.2,MIT
+omniauth-github,1.3.0,MIT
 omniauth-gitlab,1.0.2,MIT
 omniauth-google-oauth2,0.5.3,MIT
-omniauth-jwt,0.0.2,MIT
 omniauth-kerberos,0.3.0,MIT
 omniauth-multipassword,0.4.2,MIT
 omniauth-oauth,1.1.0,MIT
@@ -1130,36 +1175,39 @@ opener,1.4.3,(WTFPL OR MIT)
 opn,5.2.0,MIT
 optimist,0.6.1,MIT
 optionator,0.8.2,MIT
+ora,0.2.3,MIT
 org-ruby,0.9.12,MIT
 original,1.0.0,MIT
 orm_adapter,0.5.0,MIT
 os,0.9.6,MIT
 os-browserify,0.2.1,MIT
-os-browserify,0.3.0,MIT
 os-homedir,1.0.2,MIT
-os-locale,1.4.0,MIT
 os-locale,2.1.0,MIT
 os-tmpdir,1.0.2,MIT
 osenv,0.1.5,ISC
 p-cancelable,0.3.0,MIT
+p-cancelable,0.4.1,MIT
+p-each-series,1.0.0,MIT
 p-finally,1.0.0,MIT
-p-limit,1.1.0,MIT
+p-is-promise,1.1.0,MIT
+p-lazy,1.0.0,MIT
 p-limit,1.2.0,MIT
 p-locate,2.0.0,MIT
 p-map,1.1.1,MIT
-p-timeout,1.2.0,MIT
+p-reduce,1.0.0,MIT
+p-timeout,1.2.1,MIT
+p-timeout,2.0.1,MIT
 p-try,1.0.0,MIT
 pac-proxy-agent,1.1.0,MIT
 pac-resolver,2.0.0,MIT
 package-json,4.0.1,MIT
 pako,0.2.9,MIT
-pako,1.0.5,(MIT AND Zlib)
 pako,1.0.6,(MIT AND Zlib)
 parallel-transform,1.1.0,MIT
-parents,1.0.1,MIT
 parse-asn1,5.1.0,ISC
 parse-glob,3.0.4,MIT
 parse-json,2.2.0,MIT
+parse-json,4.0.0,MIT
 parse-passwd,1.0.0,MIT
 parseqs,0.0.5,MIT
 parseuri,0.0.5,MIT
@@ -1173,18 +1221,15 @@ path-is-absolute,1.0.1,MIT
 path-is-inside,1.0.2,(WTFPL OR MIT)
 path-key,2.0.1,MIT
 path-parse,1.0.5,MIT
-path-platform,0.11.15,MIT
 path-proxy,1.0.0,MIT
 path-to-regexp,0.1.7,MIT
 path-type,1.1.0,MIT
-path-type,2.0.0,MIT
 path-type,3.0.0,MIT
 pause-stream,0.0.11,Apache 2.0
 pbkdf2,3.0.14,MIT
 peek,1.0.1,MIT
 peek-gc,0.0.2,MIT
 peek-mysql2,1.1.0,MIT
-peek-performance_bar,1.3.1,MIT
 peek-pg,1.3.0,MIT
 peek-rblineprof,0.2.0,MIT
 peek-redis,1.2.0,MIT
@@ -1206,9 +1251,8 @@ portfinder,1.0.13,MIT
 posix-character-classes,0.1.1,MIT
 posix-spawn,0.3.13,MIT
 postcss,5.2.16,MIT
-postcss,6.0.14,MIT
-postcss,6.0.15,MIT
 postcss,6.0.19,MIT
+postcss,6.0.21,MIT
 postcss-calc,5.3.1,MIT
 postcss-colormin,2.2.2,MIT
 postcss-convert-values,2.6.1,MIT
@@ -1248,13 +1292,15 @@ prelude-ls,1.1.2,MIT
 premailer,1.10.4,New BSD
 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.10.2,MIT
 prettier,1.11.1,MIT
 prettier,1.8.2,MIT
+pretty-bytes,4.0.2,MIT
 prismjs,1.6.0,MIT
 private,0.1.8,MIT
 process,0.11.10,MIT
-process,0.11.9,MIT
 process-nextick-args,1.0.7,MIT
 process-nextick-args,2.0.0,MIT
 progress,1.1.8,MIT
@@ -1263,6 +1309,7 @@ promise-inflight,1.0.1,ISC
 proxy-addr,2.0.3,MIT
 proxy-agent,2.0.0,MIT
 prr,0.0.0,MIT
+prr,1.0.1,MIT
 ps-tree,1.1.0,MIT
 pseudomap,1.0.2,ISC
 pstree.remy,1.1.0,MIT
@@ -1280,11 +1327,12 @@ 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
 querystring,0.2.0,MIT
 querystring-es3,0.2.1,MIT
 querystringify,0.0.4,MIT
 querystringify,1.0.0,MIT
-rack,1.6.9,MIT
+rack,1.6.10,MIT
 rack-accept,0.4.5,MIT
 rack-attack,4.4.1,MIT
 rack-cors,1.0.2,MIT
@@ -1300,7 +1348,7 @@ rails-i18n,4.0.9,MIT
 railties,4.2.10,MIT
 rainbow,2.2.2,MIT
 raindrops,0.18.0,LGPL-2.1+
-rake,12.3.0,MIT
+rake,12.3.1,MIT
 randomatic,1.1.7,MIT
 randombytes,2.0.6,MIT
 randomfill,1.0.4,MIT
@@ -1313,27 +1361,24 @@ rb-fsevent,0.10.2,MIT
 rb-inotify,0.9.10,MIT
 rbnacl,4.0.2,MIT
 rbnacl-libsodium,1.0.11,MIT
-rc,1.2.1,(BSD-2-Clause OR MIT OR Apache-2.0)
 rc,1.2.5,(BSD-2-Clause OR MIT OR Apache-2.0)
 rdoc,4.2.2,ruby
 re2,1.1.1,New BSD
-react-dev-utils,5.0.0,MIT
-react-error-overlay,4.0.0,MIT
-read-only-stream,2.0.0,MIT
+read-chunk,2.1.0,MIT
 read-pkg,1.1.0,MIT
-read-pkg,2.0.0,MIT
+read-pkg,3.0.0,MIT
 read-pkg-up,1.0.1,MIT
-read-pkg-up,2.0.0,MIT
+read-pkg-up,3.0.0,MIT
 readable-stream,1.1.14,MIT
 readable-stream,2.0.6,MIT
-readable-stream,2.3.3,MIT
 readable-stream,2.3.4,MIT
 readdirp,2.1.0,MIT
 readline2,1.0.1,MIT
 recaptcha,3.0.0,MIT
+recast,0.12.9,MIT
+recast,0.14.7,MIT
 rechoir,0.6.2,MIT
 recursive-open-struct,1.0.5,MIT
-recursive-readdir,2.2.1,MIT
 redcarpet,3.4.0,MIT
 redent,1.0.0,MIT
 redis,2.8.0,MIT
@@ -1364,6 +1409,8 @@ repeat-element,1.1.2,MIT
 repeat-string,0.2.2,MIT
 repeat-string,1.6.1,MIT
 repeating,2.0.1,MIT
+replace-ext,0.0.1,MIT
+replace-ext,1.0.0,MIT
 representable,3.0.4,MIT
 request,2.75.0,Apache 2.0
 request,2.81.0,Apache 2.0
@@ -1378,24 +1425,27 @@ require-uncached,1.0.3,MIT
 requires-port,1.0.0,MIT
 resolve,1.1.7,MIT
 resolve,1.5.0,MIT
+resolve,1.7.1,MIT
 resolve-cwd,2.0.0,MIT
 resolve-dir,1.0.1,MIT
 resolve-from,1.0.1,MIT
 resolve-from,3.0.0,MIT
 resolve-url,0.2.1,MIT
-responders,2.3.0,MIT
+responders,2.4.0,MIT
+responselike,1.0.2,MIT
 rest-client,2.0.2,MIT
 restore-cursor,1.0.1,MIT
 restore-cursor,2.0.0,MIT
 ret,0.1.15,MIT
 retriable,3.1.1,MIT
 right-align,0.1.3,MIT
+rimraf,2.2.8,MIT
 rimraf,2.6.1,ISC
 rimraf,2.6.2,ISC
 rinku,2.0.0,ISC
 ripemd160,2.0.1,MIT
 rotp,2.1.2,MIT
-rouge,2.2.1,MIT
+rouge,3.1.1,MIT
 rqrcode,0.7.0,MIT
 rqrcode-rails3,0.1.7,MIT
 ruby-enum,0.7.2,MIT
@@ -1413,6 +1463,7 @@ run-queue,1.0.3,ISC
 rx-lite,3.1.2,Apache 2.0
 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-regex,1.1.0,MIT
 safe_yaml,1.0.4,MIT
@@ -1423,8 +1474,8 @@ sass-listen,4.0.0,MIT
 sass-rails,5.0.6,MIT
 sawyer,0.8.1,MIT
 sax,1.2.2,ISC
-schema-utils,0.3.0,MIT
 schema-utils,0.4.5,MIT
+scoped-regex,1.0.0,MIT
 securecompare,1.0.0,MIT
 seed-fu,2.3.7,MIT
 select,1.1.2,MIT
@@ -1452,11 +1503,11 @@ setprototypeof,1.1.0,ISC
 settingslogic,2.0.9,MIT
 sexp_processor,4.9.0,MIT
 sha.js,2.4.10,MIT
-shasum,1.0.2,MIT
+sha1,1.1.1,New BSD
 shebang-command,1.2.0,MIT
 shebang-regex,1.0.0,MIT
-shell-quote,1.6.1,MIT
 shelljs,0.7.8,New BSD
+shelljs,0.8.1,New BSD
 sidekiq,5.0.5,LGPL
 sidekiq-cron,0.6.0,MIT
 sidekiq-limit_fetch,3.4.0,MIT
@@ -1466,6 +1517,7 @@ slack-node,0.2.0,MIT
 slack-notifier,1.5.1,MIT
 slash,1.0.0,MIT
 slice-ansi,0.0.4,MIT
+slide,1.1.6,ISC
 smart-buffer,1.1.15,MIT
 smtp-connection,2.12.0,MIT
 snapdragon,0.8.1,MIT
@@ -1483,6 +1535,7 @@ socks,1.1.10,MIT
 socks,1.1.9,MIT
 socks-proxy-agent,2.1.1,MIT
 sort-keys,1.1.2,MIT
+sort-keys,2.0.0,MIT
 source-list-map,2.0.0,MIT
 source-map,0.2.0,New BSD
 source-map,0.4.4,New BSD
@@ -1516,50 +1569,51 @@ statuses,1.3.1,MIT
 statuses,1.4.0,MIT
 stream-browserify,2.0.1,MIT
 stream-combiner,0.0.4,MIT
-stream-combiner2,1.1.1,MIT
 stream-each,1.2.2,MIT
-stream-http,2.6.3,MIT
 stream-http,2.8.0,MIT
 stream-shift,1.0.0,MIT
-stream-splicer,2.0.0,MIT
+stream-to-observable,0.2.0,MIT
 streamroller,0.7.0,MIT
 strict-uri-encode,1.1.0,MIT
+string-template,0.2.1,MIT
 string-width,1.0.2,MIT
-string-width,2.0.0,MIT
 string-width,2.1.1,MIT
 string_decoder,0.10.31,MIT
 string_decoder,1.0.3,MIT
-stringex,2.7.1,MIT
+stringex,2.8.4,MIT
 stringstream,0.0.5,MIT
+strip-ansi,0.1.1,MIT
 strip-ansi,3.0.1,MIT
 strip-ansi,4.0.0,MIT
 strip-bom,2.0.0,MIT
 strip-bom,3.0.0,MIT
+strip-bom-stream,2.0.0,MIT
 strip-eof,1.0.0,MIT
 strip-indent,1.0.1,MIT
 strip-json-comments,2.0.1,MIT
-style-loader,0.20.2,MIT
-subarg,1.0.0,MIT
+style-loader,0.21.0,MIT
 supports-color,2.0.0,MIT
 supports-color,3.2.3,MIT
-supports-color,4.2.1,MIT
-supports-color,4.5.0,MIT
 supports-color,5.1.0,MIT
 supports-color,5.2.0,MIT
+supports-color,5.4.0,MIT
 svg4everybody,2.1.9,CC0-1.0
 svgo,0.7.2,MIT
-syntax-error,1.4.0,MIT
+symbol-observable,0.2.4,MIT
+symbol-observable,1.0.1,MIT
 sys-filesystem,1.1.6,Artistic 2.0
 table,3.8.3,New BSD
 tapable,0.1.10,MIT
-tapable,0.2.8,MIT
+tapable,1.0.0,MIT
 tar,2.2.1,ISC
 tar-pack,3.4.1,Simplified BSD
+temp,0.8.3,MIT
 temple,0.7.7,MIT
 term-size,1.2.0,MIT
-test-exclude,4.1.1,ISC
+test-exclude,4.2.1,ISC
 text,1.3.1,MIT
 text-table,0.2.0,MIT
+textextensions,2.2.0,MIT
 thor,0.19.4,MIT
 thread_safe,0.3.6,Apache 2.0
 three,0.84.0,MIT
@@ -1570,7 +1624,6 @@ through2,2.0.3,MIT
 thunkify,2.1.2,MIT
 thunky,0.1.0,MIT*
 tilt,2.0.6,MIT
-time-stamp,2.0.0,MIT
 timeago.js,3.0.2,MIT
 timed-out,4.0.1,MIT
 timers-browserify,1.4.2,MIT
@@ -1585,6 +1638,7 @@ to-fast-properties,1.0.3,MIT
 to-fast-properties,2.0.0,MIT
 to-object-path,0.3.0,MIT
 to-regex,3.0.1,MIT
+to-regex,3.0.2,MIT
 to-regex-range,2.1.1,MIT
 toml-rb,1.0.0,MIT
 touch,3.1.0,ISC
@@ -1597,7 +1651,6 @@ tryer,1.0.0,MIT
 tryit,1.0.3,MIT
 tsscmp,1.0.5,MIT
 tty-browserify,0.0.0,MIT
-tty-browserify,0.0.1,MIT
 tunnel-agent,0.4.3,Apache 2.0
 tunnel-agent,0.6.0,Apache 2.0
 tweetnacl,0.14.5,Unlicense
@@ -1608,16 +1661,17 @@ tzinfo,1.2.5,MIT
 u2f,0.2.1,MIT
 uber,0.1.0,MIT
 uglifier,2.7.2,MIT
+uglify-es,3.3.9,Simplified BSD
 uglify-js,2.8.29,Simplified BSD
 uglify-to-browserify,1.0.2,MIT
-uglifyjs-webpack-plugin,0.4.6,MIT
+uglifyjs-webpack-plugin,1.2.5,MIT
 uid-number,0.0.6,ISC
 ultron,1.1.1,MIT
-umd,3.0.1,MIT
 unc-path-regex,0.1.2,MIT
 undefsafe,2.0.2,MIT
+underscore,1.6.0,MIT
 underscore,1.7.0,MIT
-underscore,1.8.3,MIT
+underscore,1.9.0,MIT
 unf,0.1.4,BSD
 unf_ext,0.0.7.5,MIT
 unicorn,5.1.0,ruby
@@ -1631,25 +1685,30 @@ unique-slug,2.0.0,ISC
 unique-string,1.0.0,MIT
 unpipe,1.0.0,MIT
 unset-value,1.0.0,MIT
+untildify,3.0.2,MIT
 unzip-response,2.0.1,MIT
 upath,1.0.2,MIT
 update-notifier,2.3.0,Simplified BSD
 urix,0.1.0,MIT
 url,0.11.0,MIT
-url-loader,0.6.2,MIT
+url-join,2.0.5,MIT
+url-join,4.0.0,MIT
+url-loader,1.0.1,MIT
 url-parse,1.0.5,MIT
 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
 user-home,2.0.0,MIT
-useragent,2.3.0,MIT
+useragent,2.2.1,MIT
 util,0.10.3,MIT
 util-deprecate,1.0.2,MIT
 utils-merge,1.0.1,MIT
 uuid,3.2.1,MIT
 uws,9.14.0,Zlib
+v8-compile-cache,1.1.2,MIT
 validate-npm-package-license,3.0.1,Apache 2.0
 validates_hostname,1.0.6,MIT
 vary,1.1.1,MIT
@@ -1657,38 +1716,46 @@ vary,1.1.2,MIT
 vendors,1.0.1,MIT
 verror,1.10.0,MIT
 version_sorter,2.1.0,MIT
+vinyl,1.2.0,MIT
+vinyl,2.1.0,MIT
+vinyl-file,2.0.0,MIT
 virtus,1.0.5,MIT
 visibilityjs,1.2.4,MIT
 vm-browserify,0.0.4,MIT
 vmstat,2.3.0,MIT
 void-elements,2.0.1,MIT
-vue,2.5.13,MIT
+vue,2.5.16,MIT
 vue-eslint-parser,2.0.1,MIT
-vue-hot-reload-api,2.2.4,MIT
-vue-loader,14.1.1,MIT
-vue-resource,1.3.5,MIT
+vue-hot-reload-api,2.3.0,MIT
+vue-loader,14.2.2,MIT
+vue-resource,1.5.0,MIT
 vue-router,3.0.1,MIT
-vue-style-loader,4.0.2,MIT
-vue-template-compiler,2.5.13,MIT
+vue-style-loader,4.1.0,MIT
+vue-template-compiler,2.5.16,MIT
 vue-template-es2015-compiler,1.6.0,MIT
+vue-virtual-scroll-list,1.2.5,MIT
 vuex,3.0.1,MIT
-warden,1.2.6,MIT
-watchpack,1.4.0,MIT
+warden,1.2.7,MIT
+watchpack,1.5.0,MIT
 wbuf,1.7.2,MIT
-webpack,3.11.0,MIT
-webpack-bundle-analyzer,2.10.0,MIT
-webpack-dev-middleware,1.12.2,MIT
-webpack-dev-server,2.11.2,MIT
+webpack,4.7.0,MIT
+webpack-addons,1.1.5,MIT
+webpack-bundle-analyzer,2.11.1,MIT
+webpack-cli,2.1.2,MIT
+webpack-dev-middleware,2.0.6,MIT
+webpack-dev-middleware,3.1.3,MIT
+webpack-dev-server,3.1.4,MIT
+webpack-log,1.1.2,MIT
+webpack-log,1.2.0,MIT
 webpack-rails,0.9.10,MIT
 webpack-sources,1.0.1,MIT
-webpack-stats-plugin,0.1.5,MIT
+webpack-sources,1.1.0,MIT
+webpack-stats-plugin,0.2.1,MIT
 websocket-driver,0.6.5,MIT
 websocket-extensions,0.1.1,MIT
 when,3.7.8,MIT
 whet.extend,0.9.9,MIT
-which,1.2.12,ISC
 which,1.3.0,ISC
-which-module,1.0.0,ISC
 which-module,2.0.0,ISC
 wide-align,1.1.2,ISC
 widest-line,2.0.0,MIT
@@ -1697,10 +1764,12 @@ window-size,0.1.0,MIT
 wordwrap,0.0.2,MIT
 wordwrap,0.0.3,MIT
 wordwrap,1.0.0,MIT
-worker-loader,1.1.0,MIT
+worker-farm,1.5.2,MIT
+worker-loader,1.1.1,MIT
 wrap-ansi,2.1.0,MIT
 wrappy,1.0.2,ISC
 write,0.2.1,MIT
+write-file-atomic,1.3.4,ISC
 write-file-atomic,2.3.0,ISC
 ws,3.3.3,MIT
 ws,4.0.0,MIT
@@ -1712,9 +1781,12 @@ xtend,4.0.1,MIT
 y18n,3.2.1,ISC
 y18n,4.0.0,ISC
 yallist,2.1.2,ISC
+yargs,1.2.6,MIT
+yargs,11.0.0,MIT
+yargs,11.1.0,MIT
 yargs,3.10.0,MIT
-yargs,6.6.0,MIT
-yargs,8.0.2,MIT
-yargs-parser,4.2.1,ISC
-yargs-parser,7.0.0,ISC
+yargs-parser,9.0.2,ISC
 yeast,0.1.2,MIT
+yeoman-environment,2.0.5,Simplified BSD
+yeoman-environment,2.0.6,Simplified BSD
+yeoman-generator,2.0.5,Simplified BSD