Merge branch 'master-ce' into drop-default-value-status-deployments

2018-11-19 14:21:35 +09:00 · 2018-11-19 14:21:35 +09:00 · 291d744db2
parent 9461778eba e20ceb56de
commit 291d744db2
605 changed files with 6416 additions and 3339 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,4 +1,4 @@
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"

 .dedicated-runner: &dedicated-runner
  retry: 1
@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git
    - gitlab-org

 .default-cache: &default-cache
-  key: "ruby-2.4.5-debian-stretch-with-yarn"
+  key: "debian-stretch-ruby-2.5.3-node-10.x"
  paths:
    - vendor/ruby
    - .yarn-cache/
@ -32,6 +32,7 @@ variables:
  GET_SOURCES_ATTEMPTS: "3"
  KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
  FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
+  BUILD_ASSETS_IMAGE: "false"

 before_script:
  - bundle --version
@ -75,15 +76,17 @@ stages:
    - mysql:5.7
    - redis:alpine

-.rails5: &rails5
-  allow_failure: true
-  only:
+.rails4: &rails4
+  allow_failure: false
+  except:
    variables:
-      - $CI_COMMIT_REF_NAME =~ /rails5/
-      - $RAILS5_ENABLED
+      - $CI_COMMIT_REF_NAME =~ /(^docs[\/-].*|.*-docs$)/
+      - $CI_COMMIT_REF_NAME =~ /(^qa[\/-].*|.*-qa$)/
+      - $CI_COMMIT_REF_NAME =~ /norails4/
+      - $RAILS5_DISABLED
  variables:
-    BUNDLE_GEMFILE: "Gemfile.rails5"
-    RAILS5: "true"
+    BUNDLE_GEMFILE: "Gemfile.rails4"
+    RAILS5: "false"

 # Skip all jobs except the ones that begin with 'docs/'.
 # Used for commits including ONLY documentation changes.
@ -121,7 +124,7 @@ stages:
  <<: *except-docs-and-qa

 .single-script-job: &single-script-job
-  image: ruby:2.4-alpine
+  image: ruby:2.5-alpine
  stage: test
  cache: {}
  dependencies: []
@ -148,13 +151,12 @@ stages:
  stage: test
  script:
    - JOB_NAME=( $CI_JOB_NAME )
-    - export CI_NODE_INDEX=${JOB_NAME[-2]}
-    - export CI_NODE_TOTAL=${JOB_NAME[-1]}
-    - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${JOB_NAME[0]}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - TEST_TOOL=${JOB_NAME[0]}
+    - export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${TEST_TOOL}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
    - export KNAPSACK_GENERATE_REPORT=true
    - export SUITE_FLAKY_RSPEC_REPORT_PATH=${FLAKY_RSPEC_SUITE_REPORT_PATH}
-    - export FLAKY_RSPEC_REPORT_PATH=rspec_flaky/all_${JOB_NAME[0]}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
-    - export NEW_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/new_${JOB_NAME[0]}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - export FLAKY_RSPEC_REPORT_PATH=rspec_flaky/all_${TEST_TOOL}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
+    - export NEW_FLAKY_RSPEC_REPORT_PATH=rspec_flaky/new_${TEST_TOOL}_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
    - export FLAKY_RSPEC_GENERATE_REPORT=true
    - export CACHE_CLASSES=true
    - cp ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
@ -177,17 +179,17 @@ stages:
  <<: *rspec-metadata
  <<: *use-pg

-.rspec-metadata-pg-rails5: &rspec-metadata-pg-rails5
+.rspec-metadata-pg-rails4: &rspec-metadata-pg-rails4
  <<: *rspec-metadata-pg
-  <<: *rails5
+  <<: *rails4

 .rspec-metadata-mysql: &rspec-metadata-mysql
  <<: *rspec-metadata
  <<: *use-mysql

-.rspec-metadata-mysql-rails5: &rspec-metadata-mysql-rails5
+.rspec-metadata-mysql-rails4: &rspec-metadata-mysql-rails4
  <<: *rspec-metadata-mysql
-  <<: *rails5
+  <<: *rails4

 .only-canonical-masters: &only-canonical-masters
  only:
@ -227,6 +229,8 @@ stages:
  script:
    - git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v9.3.0
    - git checkout -f FETCH_HEAD
+    - sed -i "s/gem 'oj', '~> 2.17.4'//" Gemfile
+    - bundle update google-protobuf grpc
    - bundle install $BUNDLE_INSTALL_FLAGS
    - date
    - cp config/gitlab.yml.example config/gitlab.yml
@ -316,10 +320,10 @@ review-docs-cleanup:
 # Trigger a docker image build in CNG (Cloud Native GitLab) repository
 #
 cloud-native-image:
-  image: ruby:2.4-alpine
+  image: ruby:2.5-alpine
  before_script: []
  dependencies: []
-  stage: test
+  stage: post-test
  allow_failure: true
  variables:
    GIT_DEPTH: "1"
@ -369,7 +373,7 @@ update-tests-metadata:

 flaky-examples-check:
  <<: *dedicated-runner
-  image: ruby:2.4-alpine
+  image: ruby:2.5-alpine
  services: []
  before_script: []
  variables:
@ -427,7 +431,7 @@ setup-test-env:
  script:
    - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
    - scripts/gitaly-test-build # Do not use 'bundle exec' here
-    - BUNDLE_GEMFILE=Gemfile.rails5 bundle install $BUNDLE_INSTALL_FLAGS
+    - BUNDLE_GEMFILE=Gemfile.rails4 bundle install $BUNDLE_INSTALL_FLAGS
  artifacts:
    expire_in: 7d
    paths:
@ -457,129 +461,21 @@ danger-review:
    - yarn install --frozen-lockfile --cache-folder .yarn-cache
    - danger --fail-on-errors=true

-rspec-pg 0 30: *rspec-metadata-pg
-rspec-pg 1 30: *rspec-metadata-pg
-rspec-pg 2 30: *rspec-metadata-pg
-rspec-pg 3 30: *rspec-metadata-pg
-rspec-pg 4 30: *rspec-metadata-pg
-rspec-pg 5 30: *rspec-metadata-pg
-rspec-pg 6 30: *rspec-metadata-pg
-rspec-pg 7 30: *rspec-metadata-pg
-rspec-pg 8 30: *rspec-metadata-pg
-rspec-pg 9 30: *rspec-metadata-pg
-rspec-pg 10 30: *rspec-metadata-pg
-rspec-pg 11 30: *rspec-metadata-pg
-rspec-pg 12 30: *rspec-metadata-pg
-rspec-pg 13 30: *rspec-metadata-pg
-rspec-pg 14 30: *rspec-metadata-pg
-rspec-pg 15 30: *rspec-metadata-pg
-rspec-pg 16 30: *rspec-metadata-pg
-rspec-pg 17 30: *rspec-metadata-pg
-rspec-pg 18 30: *rspec-metadata-pg
-rspec-pg 19 30: *rspec-metadata-pg
-rspec-pg 20 30: *rspec-metadata-pg
-rspec-pg 21 30: *rspec-metadata-pg
-rspec-pg 22 30: *rspec-metadata-pg
-rspec-pg 23 30: *rspec-metadata-pg
-rspec-pg 24 30: *rspec-metadata-pg
-rspec-pg 25 30: *rspec-metadata-pg
-rspec-pg 26 30: *rspec-metadata-pg
-rspec-pg 27 30: *rspec-metadata-pg
-rspec-pg 28 30: *rspec-metadata-pg
-rspec-pg 29 30: *rspec-metadata-pg
+rspec-pg:
+  <<: *rspec-metadata-pg
+  parallel: 30

-rspec-mysql 0 30: *rspec-metadata-mysql
-rspec-mysql 1 30: *rspec-metadata-mysql
-rspec-mysql 2 30: *rspec-metadata-mysql
-rspec-mysql 3 30: *rspec-metadata-mysql
-rspec-mysql 4 30: *rspec-metadata-mysql
-rspec-mysql 5 30: *rspec-metadata-mysql
-rspec-mysql 6 30: *rspec-metadata-mysql
-rspec-mysql 7 30: *rspec-metadata-mysql
-rspec-mysql 8 30: *rspec-metadata-mysql
-rspec-mysql 9 30: *rspec-metadata-mysql
-rspec-mysql 10 30: *rspec-metadata-mysql
-rspec-mysql 11 30: *rspec-metadata-mysql
-rspec-mysql 12 30: *rspec-metadata-mysql
-rspec-mysql 13 30: *rspec-metadata-mysql
-rspec-mysql 14 30: *rspec-metadata-mysql
-rspec-mysql 15 30: *rspec-metadata-mysql
-rspec-mysql 16 30: *rspec-metadata-mysql
-rspec-mysql 17 30: *rspec-metadata-mysql
-rspec-mysql 18 30: *rspec-metadata-mysql
-rspec-mysql 19 30: *rspec-metadata-mysql
-rspec-mysql 20 30: *rspec-metadata-mysql
-rspec-mysql 21 30: *rspec-metadata-mysql
-rspec-mysql 22 30: *rspec-metadata-mysql
-rspec-mysql 23 30: *rspec-metadata-mysql
-rspec-mysql 24 30: *rspec-metadata-mysql
-rspec-mysql 25 30: *rspec-metadata-mysql
-rspec-mysql 26 30: *rspec-metadata-mysql
-rspec-mysql 27 30: *rspec-metadata-mysql
-rspec-mysql 28 30: *rspec-metadata-mysql
-rspec-mysql 29 30: *rspec-metadata-mysql
+rspec-mysql:
+  <<: *rspec-metadata-mysql
+  parallel: 30

-rspec-pg-rails5 0 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 1 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 2 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 3 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 4 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 5 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 6 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 7 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 8 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 9 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 10 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 11 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 12 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 13 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 14 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 15 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 16 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 17 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 18 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 19 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 20 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 21 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 22 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 23 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 24 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 25 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 26 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 27 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 28 30: *rspec-metadata-pg-rails5
-rspec-pg-rails5 29 30: *rspec-metadata-pg-rails5
+rspec-pg-rails4:
+  <<: *rspec-metadata-pg-rails4
+  parallel: 30

-rspec-mysql-rails5 0 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 1 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 2 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 3 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 4 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 5 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 6 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 7 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 8 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 9 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 10 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 11 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 12 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 13 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 14 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 15 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 16 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 17 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 18 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 19 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 20 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 21 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 22 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 23 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 24 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 25 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 26 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 27 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 28 30: *rspec-metadata-mysql-rails5
-rspec-mysql-rails5 29 30: *rspec-metadata-mysql-rails5
+rspec-mysql-rails4:
+  <<: *rspec-metadata-mysql-rails4
+  parallel: 30

 static-analysis:
  <<: *dedicated-no-docs-no-db-pull-cache-job
@ -589,7 +485,7 @@ static-analysis:
  script:
    - scripts/static-analysis
  cache:
-    key: "ruby-2.4.5-debian-stretch-with-yarn-and-rubocop"
+    key: "debian-stretch-ruby-2.5.3-node-10.x-and-rubocop"
    paths:
      - vendor/ruby
      - .yarn-cache/
@ -625,11 +521,11 @@ downtime_check:
    - /(^docs[\/-].*|.*-docs$)/
    - /(^qa[\/-].*|.*-qa$)/

-rails5_gemfile_lock_check:
+rails4_gemfile_lock_check:
  <<: *dedicated-no-docs-no-db-pull-cache-job
  <<: *except-docs-and-qa
  script:
-    - scripts/rails5-gemfile-lock-check
+    - scripts/rails4-gemfile-lock-check

 ee_compat_check:
  <<: *rake-exec
@ -696,7 +592,7 @@ gitlab:setup-mysql:
 # Frontend-related jobs
 gitlab:assets:compile:
  <<: *dedicated-no-docs-and-no-qa-pull-cache-job
-  image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.4-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
+  image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
  dependencies: []
  services:
    - docker:stable-dind
@ -776,7 +672,8 @@ code_quality:
        --volume /var/run/docker.sock:/var/run/docker.sock
        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
  artifacts:
-    paths: [gl-code-quality-report.json]
+    reports:
+      codequality: gl-code-quality-report.json
    expire_in: 1 week

 sast:
@ -800,7 +697,8 @@ sast:
        --volume /var/run/docker.sock:/var/run/docker.sock
        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
  artifacts:
-    paths: [gl-sast-report.json]
+    reports:
+      sast: gl-sast-report.json

 dependency_scanning:
  <<: *dedicated-no-docs-no-db-pull-cache-job
@ -822,7 +720,8 @@ dependency_scanning:
        --volume /var/run/docker.sock:/var/run/docker.sock
        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
  artifacts:
-    paths: [gl-dependency-scanning-report.json]
+    reports:
+      dependency_scanning: gl-dependency-scanning-report.json

 qa:internal:
  <<: *dedicated-no-docs-no-db-pull-cache-job
@ -840,6 +739,39 @@ qa:selectors:
    - bundle install
    - bundle exec bin/qa Test::Sanity::Selectors

+.qa-frontend-node: &qa-frontend-node
+  stage: test
+  variables:
+    NODE_OPTIONS: --max_old_space_size=3584
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+      - .yarn-cache/
+  dependencies: []
+  before_script: []
+  script:
+    - date
+    - yarn install --frozen-lockfile --cache-folder .yarn-cache
+    - date
+    - yarn run webpack-prod
+
+qa-frontend-node:6:
+  <<: *qa-frontend-node
+  image: node:6-alpine
+
+qa-frontend-node:8:
+  <<: *qa-frontend-node
+  image: node:8-alpine
+
+qa-frontend-node:10:
+  <<: *qa-frontend-node
+  image: node:10-alpine
+
+qa-frontend-node:latest:
+  <<: *qa-frontend-node
+  image: node:alpine
+  allow_failure: true
+
 coverage:
  # Don't include dedicated-no-docs-no-db-pull-cache-job here since we need to
  # download artifacts from all the rspec jobs instead of from setup-test-env only
@ -889,6 +821,8 @@ pages:
    - mv coverage-javascript/ public/coverage-javascript/ || true
    - mv eslint-report.html public/ || true
    - mv webpack-report/ public/webpack-report/ || true
+    - cp .public/assets/application-*.css public/application.css || true
+    - cp .public/assets/application-*.css.gz public/application.css.gz || true
  artifacts:
    paths:
      - public
--- a/.gitlab/issue_templates/Test
+++ b/.gitlab/issue_templates/Test
@ -64,7 +64,7 @@ Some features might be simple enough that they only involve one Component, while
 more complex features could involve multiple or even all.

 Example (from https://gitlab.com/gitlab-org/gitlab-ce/issues/50353):
-* Respository is
+* Repository is
  * Intuitive
    * It's easy to select the desired file template
    * It doesn't require unnecessary actions to save the change
@ -93,4 +93,4 @@ When adding new automated tests, please keep [testing levels](https://docs.gitla
 in mind.
 -->

-/label ~Quality ~"test plan"
+/label ~Quality ~"test plan"
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-8.11.3
+10.13.0
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +1 @@
-2.4.5
+2.5.3
--- a/2
+++ b/2
@ -1 +1 @@
-0.129.0
+0.132.0
--- a/2
+++ b/2
@ -1 +1 @@
-7.1.0
+7.1.1
--- a/10
+++ b/10
@ -1,6 +1,6 @@
 # --- Special code for migrating to Rails 5.0 ---
 def rails5?
-  %w[1 true].include?(ENV["RAILS5"])
+  !%w[0 false].include?(ENV["RAILS5"])
 end

 gem_versions = {}
@ -315,7 +315,7 @@ group :development do

  # Better errors handler
  gem 'better_errors', '~> 2.1.0'
-  gem 'binding_of_caller', '~> 0.7.2'
+  gem 'binding_of_caller', '~> 0.8.0'

  # thin instead webrick
  gem 'thin', '~> 1.7.0'
@ -342,7 +342,7 @@ group :development, :test do
  gem 'minitest', '~> 5.7.0'

  # Generate Fake data
-  gem 'ffaker', '~> 2.4'
+  gem 'ffaker', '~> 2.10'

  gem 'capybara', '~> 2.15'
  gem 'capybara-screenshot', '~> 1.0.0'
@ -357,14 +357,14 @@ group :development, :test do
  gem 'rubocop-rspec', '~> 1.22.1'

  gem 'scss_lint', '~> 0.56.0', require: false
-  gem 'haml_lint', '~> 0.26.0', require: false
+  gem 'haml_lint', '~> 0.28.0', require: false
  gem 'simplecov', '~> 0.14.0', require: false
  gem 'bundler-audit', '~> 0.5.0', require: false

  gem 'benchmark-ips', '~> 2.3.0', require: false

  gem 'license_finder', '~> 5.4', require: false
-  gem 'knapsack', '~> 1.16'
+  gem 'knapsack', '~> 1.17'

  gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -4,41 +4,44 @@ GEM
    RedCloth (4.3.2)
    abstract_type (0.0.7)
    ace-rails-ap (4.1.2)
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actioncable (5.0.7)
+      actionpack (= 5.0.7)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.7)
+      actionpack (= 5.0.7)
+      actionview (= 5.0.7)
+      activejob (= 5.0.7)
      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.7)
+      actionview (= 5.0.7)
+      activesupport (= 5.0.7)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (5.0.7)
+      activesupport (= 5.0.7)
      builder (~> 3.1)
      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activerecord_sane_schema_dumper (0.2)
-      rails (>= 4, < 5)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activejob (5.0.7)
+      activesupport (= 5.0.7)
+      globalid (>= 0.3.6)
+    activemodel (5.0.7)
+      activesupport (= 5.0.7)
+    activerecord (5.0.7)
+      activemodel (= 5.0.7)
+      activesupport (= 5.0.7)
+      arel (~> 7.0)
+    activerecord_sane_schema_dumper (1.0)
+      rails (>= 5, < 6)
+    activesupport (5.0.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
    acts-as-taggable-on (5.0.0)
      activerecord (>= 4.2.8)
@ -49,7 +52,7 @@ GEM
      public_suffix (>= 2.0.2, < 4.0)
    aes_key_wrap (1.0.1)
    akismet (2.0.0)
-    arel (6.0.4)
+    arel (7.1.4)
    asana (0.6.0)
      faraday (~> 0.9)
      faraday_middleware (~> 0.9)
@ -79,7 +82,7 @@ GEM
      erubis (>= 2.6.6)
      rack (>= 0.9.0)
    bindata (2.4.3)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
    bootsnap (1.3.2)
      msgpack (~> 1.0)
@ -137,14 +140,14 @@ GEM
      addressable
    daemons (1.2.6)
    database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
    debugger-ruby_core_source (1.3.8)
    deckar01-task_list (2.0.0)
      html-pipeline
    declarative (0.0.10)
    declarative-option (0.1.0)
-    default_value_for (3.0.2)
-      activerecord (>= 3.2.0, < 5.1)
+    default_value_for (3.0.5)
+      activerecord (>= 3.2.0, < 5.2)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
    device_detector (1.0.0)
@ -202,7 +205,7 @@ GEM
      multi_json
    fast_blank (1.0.0)
    fast_gettext (1.6.0)
-    ffaker (2.4.0)
+    ffaker (2.10.0)
    ffi (1.9.25)
    flipper (0.13.0)
    flipper-active_record (0.13.0)
@ -337,11 +340,11 @@ GEM
    haml (5.0.4)
      temple (>= 0.8.0)
      tilt
-    haml_lint (0.26.0)
+    haml_lint (0.28.0)
      haml (>= 4.0, < 5.1)
      rainbow
      rake (>= 10, < 13)
-      rubocop (>= 0.49.0)
+      rubocop (>= 0.50.0)
      sysexits (~> 1.1)
    hamlit (2.8.8)
      temple (>= 0.8.0)
@ -376,7 +379,7 @@ GEM
      json (~> 1.8)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.1.0)
      concurrent-ruby (~> 1.0)
    icalendar (2.4.1)
    ice_nine (0.11.2)
@ -412,7 +415,7 @@ GEM
      kaminari-core (= 1.0.1)
    kaminari-core (1.0.1)
    kgio (2.10.0)
-    knapsack (1.16.0)
+    knapsack (1.17.0)
      rake
    kubeclient (3.1.0)
      http (~> 2.2.2)
@ -470,6 +473,7 @@ GEM
    net-ldap (0.16.0)
    net-ssh (5.0.1)
    netrc (0.11.0)
+    nio4r (2.3.1)
    nokogiri (1.8.4)
      mini_portile2 (~> 2.3.0)
    nokogumbo (1.5.0)
@ -598,7 +602,7 @@ GEM
      get_process_mem (~> 0.2)
      puma (>= 2.7, < 4)
    pyu-ruby-sasl (0.0.3.3)
-    rack (1.6.11)
+    rack (2.0.5)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (4.4.1)
@ -616,31 +620,36 @@ GEM
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.2.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
-      sprockets-rails
+    rails (5.0.7)
+      actioncable (= 5.0.7)
+      actionmailer (= 5.0.7)
+      actionpack (= 5.0.7)
+      actionview (= 5.0.7)
+      activejob (= 5.0.7)
+      activemodel (= 5.0.7)
+      activerecord (= 5.0.7)
+      activesupport (= 5.0.7)
+      bundler (>= 1.3.0)
+      railties (= 5.0.7)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
    rails-html-sanitizer (1.0.4)
      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (4.0.9)
-      i18n (~> 0.7)
-      railties (~> 4.0)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    rails-i18n (5.1.1)
+      i18n (>= 0.7, < 2)
+      railties (>= 5.0, < 6)
+    railties (5.0.7)
+      actionpack (= 5.0.7)
+      activesupport (= 5.0.7)
+      method_source
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (3.0.0)
@ -731,8 +740,7 @@ GEM
      rspec-core
    rspec-set (0.1.3)
    rspec-support (3.7.1)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
+    rspec_junit_formatter (0.4.1)
      rspec-core (>= 2, < 4, != 2.12.0)
    rspec_profiling (0.0.5)
      activerecord
@ -849,8 +857,6 @@ GEM
    sysexits (1.2.0)
    temple (0.8.0)
    test-prof (0.2.5)
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
    text (1.3.1)
    thin (1.7.2)
      daemons (~> 1.0, >= 1.0.9)
@ -913,6 +919,9 @@ GEM
      hashdiff
    webpack-rails (0.9.11)
      railties (>= 3.2.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
    wikicloth (0.8.1)
      builder
      expression_parser
@ -928,7 +937,7 @@ PLATFORMS
 DEPENDENCIES
  RedCloth (~> 4.3.2)
  ace-rails-ap (~> 4.1.0)
-  activerecord_sane_schema_dumper (= 0.2)
+  activerecord_sane_schema_dumper (= 1.0)
  acts-as-taggable-on (~> 5.0)
  addressable (~> 2.5.2)
  akismet (~> 2.0)
@ -943,7 +952,7 @@ DEPENDENCIES
  bcrypt_pbkdf (~> 1.0)
  benchmark-ips (~> 2.3.0)
  better_errors (~> 2.1.0)
-  binding_of_caller (~> 0.7.2)
+  binding_of_caller (~> 0.8.0)
  bootsnap (~> 1.3)
  bootstrap_form (~> 2.7.0)
  brakeman (~> 4.2)
@ -962,7 +971,7 @@ DEPENDENCIES
  creole (~> 0.5.0)
  database_cleaner (~> 1.5.0)
  deckar01-task_list (= 2.0.0)
-  default_value_for (~> 3.0.0)
+  default_value_for (~> 3.0.5)
  device_detector
  devise (~> 4.4)
  devise-two-factor (~> 3.0.0)
@ -977,7 +986,7 @@ DEPENDENCIES
  factory_bot_rails (~> 4.8.2)
  faraday (~> 0.12)
  fast_blank
-  ffaker (~> 2.4)
+  ffaker (~> 2.10)
  flipper (~> 0.13.0)
  flipper-active_record (~> 0.13.0)
  flipper-active_support_cache_store (~> 0.13.0)
@ -1013,7 +1022,7 @@ DEPENDENCIES
  graphiql-rails (~> 1.4.10)
  graphql (~> 1.8.0)
  grpc (~> 1.15.0)
-  haml_lint (~> 0.26.0)
+  haml_lint (~> 0.28.0)
  hamlit (~> 2.8.8)
  hangouts-chat (~> 0.0.5)
  hashie-forbidden_attributes
@ -1030,7 +1039,7 @@ DEPENDENCIES
  json-schema (~> 2.8.0)
  jwt (~> 1.5.6)
  kaminari (~> 1.0)
-  knapsack (~> 1.16)
+  knapsack (~> 1.17)
  kubeclient (~> 3.1.0)
  letter_opener_web (~> 1.3.0)
  license_finder (~> 5.4)
@ -1080,9 +1089,10 @@ DEPENDENCIES
  rack-cors (~> 1.0.0)
  rack-oauth2 (~> 1.2.1)
  rack-proxy (~> 0.6.0)
-  rails (= 4.2.10)
+  rails (= 5.0.7)
+  rails-controller-testing
  rails-deprecated_sanitizer (~> 1.0.3)
-  rails-i18n (~> 4.0.9)
+  rails-i18n (~> 5.1)
  rainbow (~> 3.0)
  raindrops (~> 0.18)
  rblineprof (~> 0.3.6)
@ -1135,7 +1145,6 @@ DEPENDENCIES
  state_machines-activerecord (~> 0.5.1)
  sys-filesystem (~> 1.1.6)
  test-prof (~> 0.2.5)
-  test_after_commit (~> 1.1)
  thin (~> 1.7.0)
  timecop (~> 0.8.0)
  toml-rb (~> 1.0.0)
--- a/Gemfile.rails4
+++ b/Gemfile.rails4
@ -1,6 +1,6 @@
-# BUNDLE_GEMFILE=Gemfile.rails5 bundle install
+# BUNDLE_GEMFILE=Gemfile.rails4 bundle install

-ENV["RAILS5"] = "true"
+ENV["RAILS5"] = "false"

 gemfile = File.expand_path("../Gemfile", __FILE__)

--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@ -4,44 +4,41 @@ GEM
    RedCloth (4.3.2)
    abstract_type (0.0.7)
    ace-rails-ap (4.1.2)
-    actioncable (5.0.7)
-      actionpack (= 5.0.7)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7)
-      actionpack (= 5.0.7)
-      actionview (= 5.0.7)
-      activejob (= 5.0.7)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.7)
-      actionview (= 5.0.7)
-      activesupport (= 5.0.7)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.7)
-      activesupport (= 5.0.7)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
      builder (~> 3.1)
      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.7)
-      activesupport (= 5.0.7)
-      globalid (>= 0.3.6)
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
-      arel (~> 7.0)
-    activerecord_sane_schema_dumper (1.0)
-      rails (>= 5, < 6)
-    activesupport (5.0.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
+      globalid (>= 0.3.0)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activerecord_sane_schema_dumper (0.2)
+      rails (>= 4, < 5)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
    acts-as-taggable-on (5.0.0)
      activerecord (>= 4.2.8)
@ -52,7 +49,7 @@ GEM
      public_suffix (>= 2.0.2, < 4.0)
    aes_key_wrap (1.0.1)
    akismet (2.0.0)
-    arel (7.1.4)
+    arel (6.0.4)
    asana (0.6.0)
      faraday (~> 0.9)
      faraday_middleware (~> 0.9)
@ -82,7 +79,7 @@ GEM
      erubis (>= 2.6.6)
      rack (>= 0.9.0)
    bindata (2.4.3)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.8.0)
      debug_inspector (>= 0.0.1)
    bootsnap (1.3.2)
      msgpack (~> 1.0)
@ -140,14 +137,14 @@ GEM
      addressable
    daemons (1.2.6)
    database_cleaner (1.5.3)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
    debugger-ruby_core_source (1.3.8)
    deckar01-task_list (2.0.0)
      html-pipeline
    declarative (0.0.10)
    declarative-option (0.1.0)
-    default_value_for (3.0.5)
-      activerecord (>= 3.2.0, < 5.2)
+    default_value_for (3.0.2)
+      activerecord (>= 3.2.0, < 5.1)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
    device_detector (1.0.0)
@ -205,7 +202,7 @@ GEM
      multi_json
    fast_blank (1.0.0)
    fast_gettext (1.6.0)
-    ffaker (2.4.0)
+    ffaker (2.10.0)
    ffi (1.9.25)
    flipper (0.13.0)
    flipper-active_record (0.13.0)
@ -340,11 +337,11 @@ GEM
    haml (5.0.4)
      temple (>= 0.8.0)
      tilt
-    haml_lint (0.26.0)
+    haml_lint (0.28.0)
      haml (>= 4.0, < 5.1)
      rainbow
      rake (>= 10, < 13)
-      rubocop (>= 0.49.0)
+      rubocop (>= 0.50.0)
      sysexits (~> 1.1)
    hamlit (2.8.8)
      temple (>= 0.8.0)
@ -379,7 +376,7 @@ GEM
      json (~> 1.8)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.1.0)
+    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
    icalendar (2.4.1)
    ice_nine (0.11.2)
@ -415,7 +412,7 @@ GEM
      kaminari-core (= 1.0.1)
    kaminari-core (1.0.1)
    kgio (2.10.0)
-    knapsack (1.16.0)
+    knapsack (1.17.0)
      rake
    kubeclient (3.1.0)
      http (~> 2.2.2)
@ -454,9 +451,9 @@ GEM
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
    method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
    mimemagic (0.3.0)
    mini_magick (4.8.0)
    mini_mime (1.0.1)
@ -473,7 +470,6 @@ GEM
    net-ldap (0.16.0)
    net-ssh (5.0.1)
    netrc (0.11.0)
-    nio4r (2.3.1)
    nokogiri (1.8.4)
      mini_portile2 (~> 2.3.0)
    nokogumbo (1.5.0)
@ -602,7 +598,7 @@ GEM
      get_process_mem (~> 0.2)
      puma (>= 2.7, < 4)
    pyu-ruby-sasl (0.0.3.3)
-    rack (2.0.5)
+    rack (1.6.11)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (4.4.1)
@ -620,36 +616,31 @@ GEM
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (5.0.7)
-      actioncable (= 5.0.7)
-      actionmailer (= 5.0.7)
-      actionpack (= 5.0.7)
-      actionview (= 5.0.7)
-      activejob (= 5.0.7)
-      activemodel (= 5.0.7)
-      activerecord (= 5.0.7)
-      activesupport (= 5.0.7)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7)
-      sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.10)
+      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.4)
      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.1)
-      i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    railties (5.0.7)
-      actionpack (= 5.0.7)
-      activesupport (= 5.0.7)
-      method_source
+    rails-i18n (4.0.9)
+      i18n (~> 0.7)
+      railties (~> 4.0)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (3.0.0)
@ -740,7 +731,8 @@ GEM
      rspec-core
    rspec-set (0.1.3)
    rspec-support (3.7.1)
-    rspec_junit_formatter (0.4.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
      rspec-core (>= 2, < 4, != 2.12.0)
    rspec_profiling (0.0.5)
      activerecord
@ -857,6 +849,8 @@ GEM
    sysexits (1.2.0)
    temple (0.8.0)
    test-prof (0.2.5)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
    text (1.3.1)
    thin (1.7.2)
      daemons (~> 1.0, >= 1.0.9)
@ -919,9 +913,6 @@ GEM
      hashdiff
    webpack-rails (0.9.11)
      railties (>= 3.2.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
    wikicloth (0.8.1)
      builder
      expression_parser
@ -937,7 +928,7 @@ PLATFORMS
 DEPENDENCIES
  RedCloth (~> 4.3.2)
  ace-rails-ap (~> 4.1.0)
-  activerecord_sane_schema_dumper (= 1.0)
+  activerecord_sane_schema_dumper (= 0.2)
  acts-as-taggable-on (~> 5.0)
  addressable (~> 2.5.2)
  akismet (~> 2.0)
@ -952,7 +943,7 @@ DEPENDENCIES
  bcrypt_pbkdf (~> 1.0)
  benchmark-ips (~> 2.3.0)
  better_errors (~> 2.1.0)
-  binding_of_caller (~> 0.7.2)
+  binding_of_caller (~> 0.8.0)
  bootsnap (~> 1.3)
  bootstrap_form (~> 2.7.0)
  brakeman (~> 4.2)
@ -971,7 +962,7 @@ DEPENDENCIES
  creole (~> 0.5.0)
  database_cleaner (~> 1.5.0)
  deckar01-task_list (= 2.0.0)
-  default_value_for (~> 3.0.5)
+  default_value_for (~> 3.0.0)
  device_detector
  devise (~> 4.4)
  devise-two-factor (~> 3.0.0)
@ -986,7 +977,7 @@ DEPENDENCIES
  factory_bot_rails (~> 4.8.2)
  faraday (~> 0.12)
  fast_blank
-  ffaker (~> 2.4)
+  ffaker (~> 2.10)
  flipper (~> 0.13.0)
  flipper-active_record (~> 0.13.0)
  flipper-active_support_cache_store (~> 0.13.0)
@ -1022,7 +1013,7 @@ DEPENDENCIES
  graphiql-rails (~> 1.4.10)
  graphql (~> 1.8.0)
  grpc (~> 1.15.0)
-  haml_lint (~> 0.26.0)
+  haml_lint (~> 0.28.0)
  hamlit (~> 2.8.8)
  hangouts-chat (~> 0.0.5)
  hashie-forbidden_attributes
@ -1039,7 +1030,7 @@ DEPENDENCIES
  json-schema (~> 2.8.0)
  jwt (~> 1.5.6)
  kaminari (~> 1.0)
-  knapsack (~> 1.16)
+  knapsack (~> 1.17)
  kubeclient (~> 3.1.0)
  letter_opener_web (~> 1.3.0)
  license_finder (~> 5.4)
@ -1089,10 +1080,9 @@ DEPENDENCIES
  rack-cors (~> 1.0.0)
  rack-oauth2 (~> 1.2.1)
  rack-proxy (~> 0.6.0)
-  rails (= 5.0.7)
-  rails-controller-testing
+  rails (= 4.2.10)
  rails-deprecated_sanitizer (~> 1.0.3)
-  rails-i18n (~> 5.1)
+  rails-i18n (~> 4.0.9)
  rainbow (~> 3.0)
  raindrops (~> 0.18)
  rblineprof (~> 0.3.6)
@ -1145,6 +1135,7 @@ DEPENDENCIES
  state_machines-activerecord (~> 0.5.1)
  sys-filesystem (~> 1.1.6)
  test-prof (~> 0.2.5)
+  test_after_commit (~> 1.1)
  thin (~> 1.7.0)
  timecop (~> 0.8.0)
  toml-rb (~> 1.0.0)
--- a/app/assets/javascripts/badges/components/badge.vue
+++ b/app/assets/javascripts/badges/components/badge.vue
@ -1,7 +1,7 @@
 <script>
 import Icon from '~/vue_shared/components/icon.vue';
 import Tooltip from '~/vue_shared/directives/tooltip';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  name: 'Badge',
--- a/app/assets/javascripts/badges/components/badge_form.vue
+++ b/app/assets/javascripts/badges/components/badge_form.vue
@ -4,7 +4,7 @@ import { mapActions, mapState } from 'vuex';
 import createFlash from '~/flash';
 import { s__, sprintf } from '~/locale';
 import LoadingButton from '~/vue_shared/components/loading_button.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import createEmptyBadge from '../empty_badge';
 import Badge from './badge.vue';

--- a/app/assets/javascripts/badges/components/badge_list.vue
+++ b/app/assets/javascripts/badges/components/badge_list.vue
@ -1,6 +1,6 @@
 <script>
 import { mapState } from 'vuex';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import BadgeListRow from './badge_list_row.vue';
 import { GROUP_BADGE } from '../constants';

--- a/app/assets/javascripts/badges/components/badge_list_row.vue
+++ b/app/assets/javascripts/badges/components/badge_list_row.vue
@ -2,7 +2,7 @@
 import { mapActions, mapState } from 'vuex';
 import { s__ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import { PROJECT_BADGE } from '../constants';
 import Badge from './badge.vue';

--- a/app/assets/javascripts/boards/components/board_list.vue
+++ b/app/assets/javascripts/boards/components/board_list.vue
@ -1,6 +1,6 @@
 <script>
 import Sortable from 'sortablejs';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import boardNewIssue from './board_new_issue.vue';
 import boardCard from './board_card.vue';
 import eventHub from '../eventhub';
--- a/app/assets/javascripts/boards/components/board_new_issue.vue
+++ b/app/assets/javascripts/boards/components/board_new_issue.vue
@ -1,6 +1,6 @@
 <script>
 import $ from 'jquery';
-import { GlButton } from '@gitlab-org/gitlab-ui';
+import { GlButton } from '@gitlab/ui';
 import eventHub from '../eventhub';
 import ProjectSelect from './project_select.vue';
 import ListIssue from '../models/issue';
--- a/app/assets/javascripts/boards/components/issue_card_inner.vue
+++ b/app/assets/javascripts/boards/components/issue_card_inner.vue
@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import { sprintf, __ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
@ -231,7 +231,7 @@ export default {
        >
          <span class="js-assignee-tooltip">
            <span class="bold d-block">Assignee</span>
-            {{ assignee.name }} 
+            {{ assignee.name }}
            <span class="text-white-50">@{{ assignee.username }}</span>
          </span>
        </user-avatar-link>
--- a/app/assets/javascripts/boards/components/issue_due_date.vue
+++ b/app/assets/javascripts/boards/components/issue_due_date.vue
@ -1,6 +1,6 @@
 <script>
 import dateFormat from 'dateformat';
-import { GlTooltip } from '@gitlab-org/gitlab-ui';
+import { GlTooltip } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import { __ } from '~/locale';
 import { getDayDifference, getTimeago, dateInWords } from '~/lib/utils/datetime_utility';
--- a/app/assets/javascripts/boards/components/issue_time_estimate.vue
+++ b/app/assets/javascripts/boards/components/issue_time_estimate.vue
@ -1,5 +1,5 @@
 <script>
-import { GlTooltip } from '@gitlab-org/gitlab-ui';
+import { GlTooltip } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import { parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility';

--- a/app/assets/javascripts/boards/components/modal/index.vue
+++ b/app/assets/javascripts/boards/components/modal/index.vue
@ -6,7 +6,7 @@ import ModalList from './list.vue';
 import ModalFooter from './footer.vue';
 import EmptyState from './empty_state.vue';
 import ModalStore from '../../stores/modal_store';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue
+++ b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import ModalStore from '../../stores/modal_store';
 import boardsStore from '../../stores/boards_store';
--- a/app/assets/javascripts/boards/components/project_select.vue
+++ b/app/assets/javascripts/boards/components/project_select.vue
@ -2,7 +2,7 @@
 import $ from 'jquery';
 import _ from 'underscore';
 import Icon from '~/vue_shared/components/icon.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../eventhub';
 import Api from '../../api';

--- a/app/assets/javascripts/deploy_keys/components/action_btn.vue
+++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../eventhub';

 export default {
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@ -6,7 +6,7 @@ import eventHub from '../eventhub';
 import DeployKeysService from '../service';
 import DeployKeysStore from '../store';
 import KeysPanel from './keys_panel.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@ -3,7 +3,7 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import Icon from '~/vue_shared/components/icon.vue';
 import { __ } from '~/locale';
 import createFlash from '~/flash';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../../notes/event_hub';
 import CompareVersions from './compare_versions.vue';
 import DiffFile from './diff_file.vue';
@ -94,7 +94,7 @@ export default {
      return __('Show latest version');
    },
    canCurrentUserFork() {
-      return this.currentUser.canFork === true && this.currentUser.canCreateMergeRequest;
+      return this.currentUser.can_fork === true && this.currentUser.can_create_merge_request;
    },
    showCompareVersions() {
      return this.mergeRequestDiffs && this.mergeRequestDiff;
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@ -40,15 +40,17 @@ export default {
  },
  computed: {
    authorName() {
-      return (this.commit.author && this.commit.author.name) || this.commit.authorName;
+      return (this.commit.author && this.commit.author.name) || this.commit.author_name;
    },
    authorUrl() {
      return (
-        (this.commit.author && this.commit.author.webUrl) || `mailto:${this.commit.authorEmail}`
+        (this.commit.author && this.commit.author.web_url) || `mailto:${this.commit.author_email}`
      );
    },
    authorAvatar() {
-      return (this.commit.author && this.commit.author.avatarUrl) || this.commit.authorGravatarUrl;
+      return (
+        (this.commit.author && this.commit.author.avatar_url) || this.commit.author_gravatar_url
+      );
    },
  },
 };
@ -66,18 +68,18 @@ export default {
    <div class="commit-detail flex-list">
      <div class="commit-content qa-commit-content">
        <a
-          :href="commit.commitUrl"
+          :href="commit.commit_url"
          class="commit-row-message item-title"
-          v-html="commit.titleHtml"
+          v-html="commit.title_html"
        ></a>

        <span class="commit-row-message d-block d-sm-none">
          &middot;
-          {{ commit.shortId }}
+          {{ commit.short_id }}
        </span>

        <button
-          v-if="commit.descriptionHtml"
+          v-if="commit.description_html"
          class="text-expander js-toggle-button"
          type="button"
          :aria-label="__('Toggle commit description')"
@ -95,29 +97,29 @@ export default {
          ></a>
          {{ s__('CommitWidget|authored') }}
          <time-ago-tooltip
-            :time="commit.authoredDate"
+            :time="commit.authored_date"
          />
        </div>

        <pre
-          v-if="commit.descriptionHtml"
+          v-if="commit.description_html"
          class="commit-row-description js-toggle-content append-bottom-8"
-          v-html="commit.descriptionHtml"
+          v-html="commit.description_html"
        ></pre>
      </div>
      <div class="commit-actions flex-row d-none d-sm-flex">
        <div
-          v-if="commit.signatureHtml"
-          v-html="commit.signatureHtml"
+          v-if="commit.signature_html"
+          v-html="commit.signature_html"
        ></div>
        <commit-pipeline-status
-          v-if="commit.pipelineStatusPath"
-          :endpoint="commit.pipelineStatusPath"
+          v-if="commit.pipeline_status_path"
+          :endpoint="commit.pipeline_status_path"
        />
        <div class="commit-sha-group">
          <div
            class="label label-monospace"
-            v-text="commit.shortId"
+            v-text="commit.short_id"
          ></div>
          <clipboard-button
            :text="commit.id"
--- a/app/assets/javascripts/diffs/components/compare_versions.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions.vue
@ -1,6 +1,6 @@
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
-import Tooltip from '@gitlab-org/gitlab-ui/dist/directives/tooltip';
+import Tooltip from '@gitlab/ui/dist/directives/tooltip';
 import { __ } from '~/locale';
 import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility';
 import Icon from '~/vue_shared/components/icon.vue';
--- a/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue
@ -56,16 +56,16 @@ export default {
  methods: {
    commitsText(version) {
      return n__(
-        `${version.commitsCount} commit,`,
-        `${version.commitsCount} commits,`,
-        version.commitsCount,
+        `${version.commits_count} commit,`,
+        `${version.commits_count} commits,`,
+        version.commits_count,
      );
    },
    href(version) {
      if (this.showCommitCount) {
-        return version.versionPath;
+        return version.version_path;
      }
-      return version.comparePath;
+      return version.compare_path;
    },
    versionName(version) {
      if (this.isLatest(version)) {
@ -74,7 +74,7 @@ export default {
      if (this.targetBranch && (this.isBase(version) || !version)) {
        return this.targetBranch.branchName;
      }
-      return `version ${version.versionIndex}`;
+      return `version ${version.version_index}`;
    },
    isActive(version) {
      if (!version) {
@ -84,11 +84,11 @@ export default {
      if (this.targetBranch) {
        return (
          (this.isBase(version) && !this.startVersion) ||
-          (this.startVersion && this.startVersion.versionIndex === version.versionIndex)
+          (this.startVersion && this.startVersion.version_index === version.version_index)
        );
      }

-      return version.versionIndex === this.mergeRequestVersion.versionIndex;
+      return version.version_index === this.mergeRequestVersion.version_index;
    },
    isBase(version) {
      if (!version || !this.targetBranch) {
@ -98,7 +98,7 @@ export default {
    },
    isLatest(version) {
      return (
-        this.mergeRequestVersion && version.versionIndex === this.targetVersions[0].versionIndex
+        this.mergeRequestVersion && version.version_index === this.targetVersions[0].version_index
      );
    },
  },
@ -142,7 +142,7 @@ export default {
              </div>
              <div>
                <small class="commit-sha">
-                  {{ version.truncatedCommitSha }}
+                  {{ version.truncated_commit_sha }}
                </small>
              </div>
              <div>
@ -151,8 +151,8 @@ export default {
                    {{ commitsText(version) }}
                  </template>
                  <time-ago
-                    v-if="version.createdAt"
-                    :time="version.createdAt"
+                    v-if="version.created_at"
+                    :time="version.created_at"
                    class="js-timeago js-timeago-render"
                  />
                </small>
--- a/app/assets/javascripts/diffs/components/diff_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_content.vue
@ -39,7 +39,7 @@ export default {
      return this.diffFile.viewer.name === 'text';
    },
    diffFileCommentForm() {
-      return this.getCommentFormForDiffFile(this.diffFile.fileHash);
+      return this.getCommentFormForDiffFile(this.diffFile.file_hash);
    },
    showNotesContainer() {
      return this.diffFile.discussions.length || this.diffFileCommentForm;
@ -73,28 +73,28 @@ export default {
        <inline-diff-view
          v-if="isInlineView"
          :diff-file="diffFile"
-          :diff-lines="diffFile.highlightedDiffLines || []"
+          :diff-lines="diffFile.highlighted_diff_lines || []"
        />
        <parallel-diff-view
          v-if="isParallelView"
          :diff-file="diffFile"
-          :diff-lines="diffFile.parallelDiffLines || []"
+          :diff-lines="diffFile.parallel_diff_lines || []"
        />
      </template>
      <diff-viewer
        v-else
        :diff-mode="diffMode"
-        :new-path="diffFile.newPath"
-        :new-sha="diffFile.diffRefs.headSha"
-        :old-path="diffFile.oldPath"
-        :old-sha="diffFile.diffRefs.baseSha"
-        :file-hash="diffFile.fileHash"
+        :new-path="diffFile.new_path"
+        :new-sha="diffFile.diff_refs.head_sha"
+        :old-path="diffFile.old_path"
+        :old-sha="diffFile.diff_refs.base_sha"
+        :file-hash="diffFile.file_hash"
        :project-path="projectPath"
      >
        <image-diff-overlay
          slot="image-overlay"
          :discussions="diffFile.discussions"
-          :file-hash="diffFile.fileHash"
+          :file-hash="diffFile.file_hash"
          :can-comment="getNoteableData.current_user.can_create_note"
        />
        <div
@ -115,7 +115,7 @@ export default {
            :save-button-title="__('Comment')"
            class="diff-comment-form new-note discussion-form discussion-form-container"
            @handleFormUpdate="handleSaveNote"
-            @cancelForm="closeDiffFileCommentForm(diffFile.fileHash)"
+            @cancelForm="closeDiffFileCommentForm(diffFile.file_hash)"
          />          
        </div>
      </diff-viewer>
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@ -3,7 +3,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import _ from 'underscore';
 import { __, sprintf } from '~/locale';
 import createFlash from '~/flash';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import DiffFileHeader from './diff_file_header.vue';
 import DiffContent from './diff_content.vue';

@ -32,6 +32,7 @@ export default {
  computed: {
    ...mapState('diffs', ['currentDiffFileId']),
    ...mapGetters(['isNotesFetched']),
+    ...mapGetters('diffs', ['getDiffFileDiscussions']),
    isCollapsed() {
      return this.file.collapsed || false;
    },
@ -39,7 +40,7 @@ export default {
      return sprintf(
        __('You can %{linkStart}view the blob%{linkEnd} instead.'),
        {
-          linkStart: `<a href="${_.escape(this.file.viewPath)}">`,
+          linkStart: `<a href="${_.escape(this.file.view_path)}">`,
          linkEnd: '</a>',
        },
        false,
@ -48,21 +49,34 @@ export default {
    showExpandMessage() {
      return (
        this.isCollapsed ||
-        (!this.file.highlightedDiffLines &&
+        (!this.file.highlighted_diff_lines &&
          !this.isLoadingCollapsedDiff &&
-          !this.file.tooLarge &&
+          !this.file.too_large &&
          this.file.text)
      );
    },
    showLoadingIcon() {
      return this.isLoadingCollapsedDiff || (!this.file.renderIt && !this.isCollapsed);
    },
+    hasDiffLines() {
+      return (
+        this.file.highlighted_diff_lines &&
+        this.file.parallel_diff_lines &&
+        this.file.parallel_diff_lines.length > 0
+      );
+    },
+  },
+  watch: {
+    'file.collapsed': function fileCollapsedWatch(newVal, oldVal) {
+      if (!newVal && oldVal && !this.hasDiffLines) {
+        this.handleLoadCollapsedDiff();
+      }
+    },
  },
  methods: {
    ...mapActions('diffs', ['loadCollapsedDiff', 'assignDiscussionsToDiff']),
    handleToggle() {
-      const { highlightedDiffLines, parallelDiffLines } = this.file;
-      if (!highlightedDiffLines && parallelDiffLines !== undefined && !parallelDiffLines.length) {
+      if (!this.hasDiffLines) {
        this.handleLoadCollapsedDiff();
      } else {
        this.file.collapsed = !this.file.collapsed;
@ -81,7 +95,7 @@ export default {
        .then(() => {
          requestIdleCallback(
            () => {
-              this.assignDiscussionsToDiff();
+              this.assignDiscussionsToDiff(this.getDiffFileDiscussions(this.file));
            },
            { timeout: 1000 },
          );
@ -103,9 +117,9 @@ export default {

 <template>
  <div
-    :id="file.fileHash"
+    :id="file.file_hash"
    :class="{
-      'is-active': currentDiffFileId === file.fileHash
+      'is-active': currentDiffFileId === file.file_hash
    }"
    class="diff-file file-holder"
  >
@ -129,7 +143,7 @@ export default {
        make your changes there, and submit a merge request.
      </span>
      <a
-        :href="file.forkPath"
+        :href="file.fork_path"
        class="js-fork-suggestion-button btn btn-grouped btn-inverted btn-success"
      >
        Fork
@ -145,7 +159,7 @@ export default {

    <diff-content
      v-if="!isCollapsed && file.renderIt"
-      :class="{ hidden: isCollapsed || file.tooLarge }"
+      :class="{ hidden: isCollapsed || file.too_large }"
      :diff-file="file"
    />
    <gl-loading-icon
@ -166,7 +180,7 @@ export default {
      </a>
    </div>
    <div
-      v-if="file.tooLarge"
+      v-if="file.too_large"
      class="nothing-here-block diff-collapsed js-too-large-diff"
    >
      {{ __('This source diff could not be displayed because it is too large.') }}
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@ -68,32 +68,32 @@ export default {
    },
    titleLink() {
      if (this.diffFile.submodule) {
-        return this.diffFile.submoduleTreeUrl || this.diffFile.submoduleLink;
+        return this.diffFile.submodule_tree_url || this.diffFile.submodule_link;
      }
      return this.discussionPath;
    },
    filePath() {
      if (this.diffFile.submodule) {
-        return `${this.diffFile.filePath} @ ${truncateSha(this.diffFile.blob.id)}`;
+        return `${this.diffFile.file_path} @ ${truncateSha(this.diffFile.blob.id)}`;
      }

-      if (this.diffFile.deletedFile) {
-        return sprintf(__('%{filePath} deleted'), { filePath: this.diffFile.filePath }, false);
+      if (this.diffFile.deleted_file) {
+        return sprintf(__('%{filePath} deleted'), { filePath: this.diffFile.file_path }, false);
      }

-      return this.diffFile.filePath;
+      return this.diffFile.file_path;
    },
    titleTag() {
-      return this.diffFile.fileHash ? 'a' : 'span';
+      return this.diffFile.file_hash ? 'a' : 'span';
    },
    isUsingLfs() {
-      return this.diffFile.storedExternally && this.diffFile.externalStorage === 'lfs';
+      return this.diffFile.stored_externally && this.diffFile.external_storage === 'lfs';
    },
    collapseIcon() {
      return this.expanded ? 'chevron-down' : 'chevron-right';
    },
    viewFileButtonText() {
-      const truncatedContentSha = _.escape(truncateSha(this.diffFile.contentSha));
+      const truncatedContentSha = _.escape(truncateSha(this.diffFile.content_sha));
      return sprintf(
        s__('MergeRequests|View file @ %{commitId}'),
        {
@ -103,7 +103,7 @@ export default {
      );
    },
    viewReplacedFileButtonText() {
-      const truncatedBaseSha = _.escape(truncateSha(this.diffFile.diffRefs.baseSha));
+      const truncatedBaseSha = _.escape(truncateSha(this.diffFile.diff_refs.base_sha));
      return sprintf(
        s__('MergeRequests|View replaced file @ %{commitId}'),
        {
@ -113,7 +113,7 @@ export default {
      );
    },
    gfmCopyText() {
-      return `\`${this.diffFile.filePath}\``;
+      return `\`${this.diffFile.file_path}\``;
    },
  },
  methods: {
@ -164,21 +164,21 @@ export default {
          aria-hidden="true"
          css-classes="js-file-icon append-right-5"
        />
-        <span v-if="diffFile.renamedFile">
+        <span v-if="diffFile.renamed_file">
          <strong
            v-tooltip
-            :title="diffFile.oldPath"
+            :title="diffFile.old_path"
            class="file-title-name"
            data-container="body"
-            v-html="diffFile.oldPathHtml"
+            v-html="diffFile.old_path_html"
          ></strong>
          →
          <strong
            v-tooltip
-            :title="diffFile.newPath"
+            :title="diffFile.new_path"
            class="file-title-name"
            data-container="body"
-            v-html="diffFile.newPathHtml"
+            v-html="diffFile.new_path_html"
          ></strong>
        </span>

@ -195,16 +195,16 @@ export default {

      <clipboard-button
        :title="__('Copy file path to clipboard')"
-        :text="diffFile.filePath"
+        :text="diffFile.file_path"
        :gfm="gfmCopyText"
        css-class="btn-default btn-transparent btn-clipboard"
      />

      <small
-        v-if="diffFile.modeChanged"
+        v-if="diffFile.mode_changed"
        ref="fileMode"
      >
-        {{ diffFile.aMode }} → {{ diffFile.bMode }}
+        {{ diffFile.a_mode }} → {{ diffFile.b_mode }}
      </small>

      <span
@ -220,7 +220,7 @@ export default {
      class="file-actions d-none d-sm-block"
    >
      <template
-        v-if="diffFile.blob && diffFile.blob.readableText"
+        v-if="diffFile.blob && diffFile.blob.readable_text"
      >
        <button
          :disabled="!diffHasDiscussions(diffFile)"
@ -234,33 +234,33 @@ export default {
        </button>

        <edit-button
-          v-if="!diffFile.deletedFile"
+          v-if="!diffFile.deleted_file"
          :can-current-user-fork="canCurrentUserFork"
-          :edit-path="diffFile.editPath"
-          :can-modify-blob="diffFile.canModifyBlob"
+          :edit-path="diffFile.edit_path"
+          :can-modify-blob="diffFile.can_modify_blob"
          @showForkMessage="showForkMessage"
        />
      </template>

      <a
-        v-if="diffFile.replacedViewPath"
-        :href="diffFile.replacedViewPath"
+        v-if="diffFile.replaced_view_path"
+        :href="diffFile.replaced_view_path"
        class="btn view-file js-view-file"
        v-html="viewReplacedFileButtonText"
      >
      </a>
      <a
-        :href="diffFile.viewPath"
+        :href="diffFile.view_path"
        class="btn view-file js-view-file"
        v-html="viewFileButtonText"
      >
      </a>

      <a
-        v-if="diffFile.externalUrl"
+        v-if="diffFile.external_url"
        v-tooltip
-        :href="diffFile.externalUrl"
-        :title="`View on ${diffFile.formattedExternalUrl}`"
+        :href="diffFile.external_url"
+        :title="`View on ${diffFile.formatted_external_url}`"
        target="_blank"
        rel="noopener noreferrer"
        class="btn btn-file-option"
--- a/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue
+++ b/app/assets/javascripts/diffs/components/diff_gutter_avatars.vue
@ -3,7 +3,7 @@ import { mapActions } from 'vuex';
 import Icon from '~/vue_shared/components/icon.vue';
 import { pluralize, truncate } from '~/lib/utils/text_utility';
 import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants';

 export default {
--- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
@ -73,7 +73,7 @@ export default {
    }),
    ...mapGetters(['isLoggedIn']),
    lineHref() {
-      return `#${this.line.lineCode || ''}`;
+      return `#${this.line.line_code || ''}`;
    },
    shouldShowCommentButton() {
      return (
@ -99,7 +99,7 @@ export default {
  methods: {
    ...mapActions('diffs', ['loadMoreLines', 'showCommentForm']),
    handleCommentButton() {
-      this.showCommentForm({ lineCode: this.line.lineCode });
+      this.showCommentForm({ lineCode: this.line.line_code });
    },
    handleLoadMoreLines() {
      if (this.isRequesting) {
@ -108,8 +108,8 @@ export default {

      this.isRequesting = true;
      const endpoint = this.contextLinesPath;
-      const oldLineNumber = this.line.metaData.oldPos || 0;
-      const newLineNumber = this.line.metaData.newPos || 0;
+      const oldLineNumber = this.line.meta_data.old_pos || 0;
+      const newLineNumber = this.line.meta_data.new_pos || 0;
      const offset = newLineNumber - oldLineNumber;
      const bottom = this.isBottom;
      const { fileHash } = this;
@ -125,12 +125,12 @@ export default {
        to = lineNumber + UNFOLD_COUNT;
      } else {
        const diffFile = utils.findDiffFile(this.diffFiles, this.fileHash);
-        const indexForInline = utils.findIndexInInlineLines(diffFile.highlightedDiffLines, {
+        const indexForInline = utils.findIndexInInlineLines(diffFile.highlighted_diff_lines, {
          oldLineNumber,
          newLineNumber,
        });
-        const prevLine = diffFile.highlightedDiffLines[indexForInline - 2];
-        const prevLineNumber = (prevLine && prevLine.newLine) || 0;
+        const prevLine = diffFile.highlighted_diff_lines[indexForInline - 2];
+        const prevLineNumber = (prevLine && prevLine.new_line) || 0;

        if (since <= prevLineNumber + 1) {
          since = prevLineNumber + 1;
--- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
@ -53,7 +53,7 @@ export default {
        this.noteableData.diff_head_sha,
        DIFF_NOTE_TYPE,
        this.noteableData.source_project_id,
-        this.line.lineCode,
+        this.line.line_code,
      ];

      this.initAutoSave(this.noteableData, keys);
@ -72,7 +72,7 @@ export default {
      }

      this.cancelCommentForm({
-        lineCode: this.line.lineCode,
+        lineCode: this.line.line_code,
      });
      this.$nextTick(() => {
        this.resetAutoSave();
@ -94,7 +94,7 @@ export default {
    <note-form
      ref="noteForm"
      :is-editing="true"
-      :line-code="line.lineCode"
+      :line-code="line.line_code"
      save-button-title="Comment"
      class="diff-comment-form"
      @cancelForm="handleCancelCommentForm"
--- a/app/assets/javascripts/diffs/components/diff_table_cell.vue
+++ b/app/assets/javascripts/diffs/components/diff_table_cell.vue
@ -96,9 +96,7 @@ export default {
      };
    },
    lineNumber() {
-      const { lineType } = this;
-
-      return lineType === OLD_LINE_TYPE ? this.line.oldLine : this.line.newLine;
+      return this.lineType === OLD_LINE_TYPE ? this.line.old_line : this.line.new_line;
    },
  },
 };
--- a/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
@ -48,7 +48,7 @@ export default {
          :discussions="line.discussions"
        />
        <diff-line-note-form
-          v-if="diffLineCommentForms[line.lineCode]"
+          v-if="diffLineCommentForms[line.line_code]"
          :diff-file-hash="diffFileHash"
          :line="line"
          :note-target-line="line"
--- a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
@ -52,9 +52,7 @@ export default {
      };
    },
    inlineRowId() {
-      const { lineCode, oldLine, newLine } = this.line;
-
-      return lineCode || `${this.fileHash}_${oldLine}_${newLine}`;
+      return this.line.line_code || `${this.fileHash}_${this.line.old_line}_${this.line.new_line}`;
    },
  },
  created() {
@ -107,7 +105,7 @@ export default {
    <td
      :class="line.type"
      class="line_content"
-      v-html="line.richText"
+      v-html="line.rich_text"
    >
    </td>
  </tr>
--- a/app/assets/javascripts/diffs/components/inline_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue
@ -43,16 +43,16 @@ export default {
        v-for="(line, index) in diffLines"
      >
        <inline-diff-table-row
-          :key="line.lineCode"
-          :file-hash="diffFile.fileHash"
-          :context-lines-path="diffFile.contextLinesPath"
+          :key="line.line_code"
+          :file-hash="diffFile.file_hash"
+          :context-lines-path="diffFile.context_lines_path"
          :line="line"
          :is-bottom="index + 1 === diffLinesLength"
        />
        <inline-diff-comment-row
          v-if="shouldRenderInlineCommentRow(line)"
          :key="index"
-          :diff-file-hash="diffFile.fileHash"
+          :diff-file-hash="diffFile.file_hash"
          :line="line"
          :line-index="index"
        />
--- a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue
@ -27,10 +27,10 @@ export default {
      diffLineCommentForms: state => state.diffs.diffLineCommentForms,
    }),
    leftLineCode() {
-      return this.line.left && this.line.left.lineCode;
+      return this.line.left && this.line.left.line_code;
    },
    rightLineCode() {
-      return this.line.right && this.line.right.lineCode;
+      return this.line.right && this.line.right.line_code;
    },
    hasExpandedDiscussionOnLeft() {
      return this.line.left && this.line.left.discussions
--- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
@ -120,11 +120,11 @@ export default {
        class="diff-line-num old_line"
      />
      <td
-        :id="line.left.lineCode"
+        :id="line.left.line_code"
        :class="parallelViewLeftLineType"
        class="line_content parallel left-side"
        @mousedown.native="handleParallelLineMouseDown"
-        v-html="line.left.richText"
+        v-html="line.left.rich_text"
      >
      </td>
    </template>
@ -146,11 +146,11 @@ export default {
        class="diff-line-num new_line"
      />
      <td
-        :id="line.right.lineCode"
+        :id="line.right.line_code"
        :class="line.right.type"
        class="line_content parallel right-side"
        @mousedown.native="handleParallelLineMouseDown"
-        v-html="line.right.richText"
+        v-html="line.right.rich_text"
      >
      </td>
    </template>
--- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
@ -46,8 +46,8 @@ export default {
        >
          <parallel-diff-table-row
            :key="index"
-            :file-hash="diffFile.fileHash"
-            :context-lines-path="diffFile.contextLinesPath"
+            :file-hash="diffFile.file_hash"
+            :context-lines-path="diffFile.context_lines_path"
            :line="line"
            :is-bottom="index + 1 === diffLinesLength"
          />
@ -55,7 +55,7 @@ export default {
            v-if="shouldRenderParallelCommentRow(line)"
            :key="`dcr-${index}`"
            :line="line"
-            :diff-file-hash="diffFile.fileHash"
+            :diff-file-hash="diffFile.file_hash"
            :line-index="index"
          />
        </template>
--- a/app/assets/javascripts/diffs/components/tree_list.vue
+++ b/app/assets/javascripts/diffs/components/tree_list.vue
@ -1,6 +1,6 @@
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import { convertPermissionToBoolean } from '~/lib/utils/common_utils';
 import Icon from '~/vue_shared/components/icon.vue';
 import FileRow from '~/vue_shared/components/file_row.vue';
--- a/app/assets/javascripts/diffs/index.js
+++ b/app/assets/javascripts/diffs/index.js
@ -1,6 +1,5 @@
 import Vue from 'vue';
 import { mapState } from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import diffsApp from './components/app.vue';

 export default function initDiffsApp(store) {
@ -17,9 +16,7 @@ export default function initDiffsApp(store) {
      return {
        endpoint: dataset.endpoint,
        projectPath: dataset.projectPath,
-        currentUser: convertObjectPropsToCamelCase(JSON.parse(dataset.currentUserData), {
-          deep: true,
-        }),
+        currentUser: JSON.parse(dataset.currentUserData) || {},
      };
    },
    computed: {
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@ -50,8 +50,8 @@ export const assignDiscussionsToDiff = (
 };

 export const removeDiscussionsFromDiff = ({ commit }, removeDiscussion) => {
-  const { fileHash, line_code, id } = removeDiscussion;
-  commit(types.REMOVE_LINE_DISCUSSIONS_FOR_FILE, { fileHash, lineCode: line_code, id });
+  const { file_hash, line_code, id } = removeDiscussion;
+  commit(types.REMOVE_LINE_DISCUSSIONS_FOR_FILE, { fileHash: file_hash, lineCode: line_code, id });
 };

 export const startRenderDiffsQueue = ({ state, commit }) => {
@ -167,7 +167,7 @@ export const expandAllFiles = ({ commit }) => {
 export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
  const discussions = getters.getDiffFileDiscussions(diff);
  const shouldCloseAll = getters.diffHasAllExpandedDiscussions(diff);
-  const shouldExpandAll = getters.diffHasAllCollpasedDiscussions(diff);
+  const shouldExpandAll = getters.diffHasAllCollapsedDiscussions(diff);

  discussions.forEach(discussion => {
    const data = { discussionId: discussion.id };
@ -189,7 +189,7 @@ export const saveDiffDiscussion = ({ dispatch }, { note, formData }) => {
  return dispatch('saveNote', postData, { root: true })
    .then(result => dispatch('updateDiscussion', result.discussion, { root: true }))
    .then(discussion => dispatch('assignDiscussionsToDiff', [discussion]))
-    .then(() => dispatch('closeDiffFileCommentForm', formData.diffFile.fileHash))
+    .then(() => dispatch('closeDiffFileCommentForm', formData.diffFile.file_hash))
    .then(() => dispatch('startTaskList', null, { root: true }))
    .catch(() => createFlash(s__('MergeRequests|Saving the comment failed')));
 };
--- a/app/assets/javascripts/diffs/store/getters.js
+++ b/app/assets/javascripts/diffs/store/getters.js
@ -1,4 +1,3 @@
-import _ from 'underscore';
 import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '../constants';

 export const isParallelView = state => state.diffViewType === PARALLEL_DIFF_VIEW_TYPE;
@ -28,7 +27,7 @@ export const diffHasAllExpandedDiscussions = (state, getters) => diff => {
 * @param {Object} diff
 * @returns {Boolean}
 */
-export const diffHasAllCollpasedDiscussions = (state, getters) => diff => {
+export const diffHasAllCollapsedDiscussions = (state, getters) => diff => {
  const discussions = getters.getDiffFileDiscussions(diff);

  return (
@ -68,8 +67,7 @@ export const diffHasDiscussions = (state, getters) => diff =>
 */
 export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) => diff =>
  rootGetters.discussions.filter(
-    discussion =>
-      discussion.diff_discussion && _.isEqual(discussion.diff_file.file_hash, diff.fileHash),
+    discussion => discussion.diff_discussion && discussion.diff_file.file_hash === diff.file_hash,
  ) || [];

 export const shouldRenderParallelCommentRow = state => line => {
@ -90,14 +88,14 @@ export const shouldRenderParallelCommentRow = state => line => {
    return true;
  }

-  const hasCommentFormOnLeft = line.left && state.diffLineCommentForms[line.left.lineCode];
-  const hasCommentFormOnRight = line.right && state.diffLineCommentForms[line.right.lineCode];
+  const hasCommentFormOnLeft = line.left && state.diffLineCommentForms[line.left.line_code];
+  const hasCommentFormOnRight = line.right && state.diffLineCommentForms[line.right.line_code];

  return hasCommentFormOnLeft || hasCommentFormOnRight;
 };

 export const shouldRenderInlineCommentRow = state => line => {
-  if (state.diffLineCommentForms[line.lineCode]) return true;
+  if (state.diffLineCommentForms[line.line_code]) return true;

  if (!line.discussions || line.discussions.length === 0) {
    return false;
@ -108,7 +106,7 @@ export const shouldRenderInlineCommentRow = state => line => {

 // prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
 export const getDiffFileByHash = state => fileHash =>
-  state.diffFiles.find(file => file.fileHash === fileHash);
+  state.diffFiles.find(file => file.file_hash === fileHash);

 export const allBlobs = state => Object.values(state.treeEntries).filter(f => f.type === 'blob');

--- a/app/assets/javascripts/diffs/store/mutations.js
+++ b/app/assets/javascripts/diffs/store/mutations.js
@ -23,12 +23,11 @@ export default {
  },

  [types.SET_DIFF_DATA](state, data) {
-    const diffData = convertObjectPropsToCamelCase(data, { deep: true });
-    prepareDiffData(diffData);
-    const { tree, treeEntries } = generateTreeList(diffData.diffFiles);
+    prepareDiffData(data);
+    const { tree, treeEntries } = generateTreeList(data.diff_files);

    Object.assign(state, {
-      ...diffData,
+      ...convertObjectPropsToCamelCase(data),
      tree: sortTree(tree),
      treeEntries,
    });
@ -42,7 +41,7 @@ export default {

  [types.SET_MERGE_REQUEST_DIFFS](state, mergeRequestDiffs) {
    Object.assign(state, {
-      mergeRequestDiffs: convertObjectPropsToCamelCase(mergeRequestDiffs, { deep: true }),
+      mergeRequestDiffs,
    });
  },

@ -62,19 +61,18 @@ export default {
    const { lineNumbers, contextLines, fileHash } = options;
    const { bottom } = options.params;
    const diffFile = findDiffFile(state.diffFiles, fileHash);
-    const { highlightedDiffLines, parallelDiffLines } = diffFile;

    removeMatchLine(diffFile, lineNumbers, bottom);

    const lines = addLineReferences(contextLines, lineNumbers, bottom).map(line => ({
      ...line,
-      lineCode: line.lineCode || `${fileHash}_${line.oldLine}_${line.newLine}`,
+      line_code: line.line_code || `${fileHash}_${line.old_line}_${line.new_line}`,
      discussions: line.discussions || [],
    }));

    addContextLines({
-      inlineLines: highlightedDiffLines,
-      parallelLines: parallelDiffLines,
+      inlineLines: diffFile.highlighted_diff_lines,
+      parallelLines: diffFile.parallel_diff_lines,
      contextLines: lines,
      bottom,
      lineNumbers,
@ -82,10 +80,9 @@ export default {
  },

  [types.ADD_COLLAPSED_DIFFS](state, { file, data }) {
-    const normalizedData = convertObjectPropsToCamelCase(data, { deep: true });
-    prepareDiffData(normalizedData);
-    const [newFileData] = normalizedData.diffFiles.filter(f => f.fileHash === file.fileHash);
-    const selectedFile = state.diffFiles.find(f => f.fileHash === file.fileHash);
+    prepareDiffData(data);
+    const [newFileData] = data.diff_files.filter(f => f.file_hash === file.file_hash);
+    const selectedFile = state.diffFiles.find(f => f.file_hash === file.file_hash);
    Object.assign(selectedFile, { ...newFileData });
  },

@ -101,20 +98,20 @@ export default {

    const discussionLineCode = discussion.line_code;
    const fileHash = discussion.diff_file.file_hash;
-    const lineCheck = ({ lineCode }) =>
-      lineCode === discussionLineCode &&
+    const lineCheck = line =>
+      line.line_code === discussionLineCode &&
      isDiscussionApplicableToLine({
        discussion,
-        diffPosition: diffPositionByLineCode[lineCode],
+        diffPosition: diffPositionByLineCode[line.line_code],
        latestDiff,
      });

    state.diffFiles = state.diffFiles.map(diffFile => {
-      if (diffFile.fileHash === fileHash) {
+      if (diffFile.file_hash === fileHash) {
        const file = { ...diffFile };

-        if (file.highlightedDiffLines) {
-          file.highlightedDiffLines = file.highlightedDiffLines.map(line => {
+        if (file.highlighted_diff_lines) {
+          file.highlighted_diff_lines = file.highlighted_diff_lines.map(line => {
            if (lineCheck(line)) {
              return {
                ...line,
@ -126,8 +123,8 @@ export default {
          });
        }

-        if (file.parallelDiffLines) {
-          file.parallelDiffLines = file.parallelDiffLines.map(line => {
+        if (file.parallel_diff_lines) {
+          file.parallel_diff_lines = file.parallel_diff_lines.map(line => {
            const left = line.left && lineCheck(line.left);
            const right = line.right && lineCheck(line.right);

@ -148,7 +145,7 @@ export default {
          });
        }

-        if (!file.parallelDiffLines || !file.highlightedDiffLines) {
+        if (!file.parallel_diff_lines || !file.highlighted_diff_lines) {
          file.discussions = file.discussions.concat(discussion);
        }

@ -160,16 +157,16 @@ export default {
  },

  [types.REMOVE_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash, lineCode, id }) {
-    const selectedFile = state.diffFiles.find(f => f.fileHash === fileHash);
+    const selectedFile = state.diffFiles.find(f => f.file_hash === fileHash);
    if (selectedFile) {
-      if (selectedFile.parallelDiffLines) {
-        const targetLine = selectedFile.parallelDiffLines.find(
+      if (selectedFile.parallel_diff_lines) {
+        const targetLine = selectedFile.parallel_diff_lines.find(
          line =>
-            (line.left && line.left.lineCode === lineCode) ||
-            (line.right && line.right.lineCode === lineCode),
+            (line.left && line.left.line_code === lineCode) ||
+            (line.right && line.right.line_code === lineCode),
        );
        if (targetLine) {
-          const side = targetLine.left && targetLine.left.lineCode === lineCode ? 'left' : 'right';
+          const side = targetLine.left && targetLine.left.line_code === lineCode ? 'left' : 'right';

          Object.assign(targetLine[side], {
            discussions: [],
@ -177,9 +174,9 @@ export default {
        }
      }

-      if (selectedFile.highlightedDiffLines) {
-        const targetInlineLine = selectedFile.highlightedDiffLines.find(
-          line => line.lineCode === lineCode,
+      if (selectedFile.highlighted_diff_lines) {
+        const targetInlineLine = selectedFile.highlighted_diff_lines.find(
+          line => line.line_code === lineCode,
        );

        if (targetInlineLine) {
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@ -1,5 +1,4 @@
 import _ from 'underscore';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { diffModes } from '~/ide/constants';
 import {
  LINE_POSITION_LEFT,
@ -15,7 +14,7 @@ import {
 } from '../constants';

 export function findDiffFile(files, hash) {
-  return files.filter(file => file.fileHash === hash)[0];
+  return files.filter(file => file.file_hash === hash)[0];
 }

 export const getReversePosition = linePosition => {
@ -39,14 +38,14 @@ export function getFormData(params) {
  } = params;

  const position = JSON.stringify({
-    base_sha: diffFile.diffRefs.baseSha,
-    start_sha: diffFile.diffRefs.startSha,
-    head_sha: diffFile.diffRefs.headSha,
-    old_path: diffFile.oldPath,
-    new_path: diffFile.newPath,
+    base_sha: diffFile.diff_refs.base_sha,
+    start_sha: diffFile.diff_refs.start_sha,
+    head_sha: diffFile.diff_refs.head_sha,
+    old_path: diffFile.old_path,
+    new_path: diffFile.new_path,
    position_type: positionType || TEXT_DIFF_POSITION_TYPE,
-    old_line: noteTargetLine ? noteTargetLine.oldLine : null,
-    new_line: noteTargetLine ? noteTargetLine.newLine : null,
+    old_line: noteTargetLine ? noteTargetLine.old_line : null,
+    new_line: noteTargetLine ? noteTargetLine.new_line : null,
    x: params.x,
    y: params.y,
    width: params.width,
@ -56,7 +55,7 @@ export function getFormData(params) {
  const postData = {
    view: diffViewType,
    line_type: linePosition === LINE_POSITION_RIGHT ? NEW_LINE_TYPE : OLD_LINE_TYPE,
-    merge_request_diff_head_sha: diffFile.diffRefs.headSha,
+    merge_request_diff_head_sha: diffFile.diff_refs.head_sha,
    in_reply_to_discussion_id: '',
    note_project_id: '',
    target_type: noteableData.targetType,
@ -69,10 +68,10 @@ export function getFormData(params) {
      noteable_id: noteableData.id,
      commit_id: '',
      type:
-        diffFile.diffRefs.startSha && diffFile.diffRefs.headSha
+        diffFile.diff_refs.start_sha && diffFile.diff_refs.head_sha
          ? DIFF_NOTE_TYPE
          : LEGACY_DIFF_NOTE_TYPE,
-      line_code: noteTargetLine ? noteTargetLine.lineCode : null,
+      line_code: noteTargetLine ? noteTargetLine.line_code : null,
    },
  };

@ -93,7 +92,7 @@ export const findIndexInInlineLines = (lines, lineNumbers) => {

  return _.findIndex(
    lines,
-    line => line.oldLine === oldLineNumber && line.newLine === newLineNumber,
+    line => line.old_line === oldLineNumber && line.new_line === newLineNumber,
  );
 };

@ -105,18 +104,18 @@ export const findIndexInParallelLines = (lines, lineNumbers) => {
    line =>
      line.left &&
      line.right &&
-      line.left.oldLine === oldLineNumber &&
-      line.right.newLine === newLineNumber,
+      line.left.old_line === oldLineNumber &&
+      line.right.new_line === newLineNumber,
  );
 };

 export function removeMatchLine(diffFile, lineNumbers, bottom) {
-  const indexForInline = findIndexInInlineLines(diffFile.highlightedDiffLines, lineNumbers);
-  const indexForParallel = findIndexInParallelLines(diffFile.parallelDiffLines, lineNumbers);
+  const indexForInline = findIndexInInlineLines(diffFile.highlighted_diff_lines, lineNumbers);
+  const indexForParallel = findIndexInParallelLines(diffFile.parallel_diff_lines, lineNumbers);
  const factor = bottom ? 1 : -1;

-  diffFile.highlightedDiffLines.splice(indexForInline + factor, 1);
-  diffFile.parallelDiffLines.splice(indexForParallel + factor, 1);
+  diffFile.highlighted_diff_lines.splice(indexForInline + factor, 1);
+  diffFile.parallel_diff_lines.splice(indexForParallel + factor, 1);
 }

 export function addLineReferences(lines, lineNumbers, bottom) {
@ -125,18 +124,16 @@ export function addLineReferences(lines, lineNumbers, bottom) {
  let matchLineIndex = -1;

  const linesWithNumbers = lines.map((l, index) => {
-    const line = convertObjectPropsToCamelCase(l);
-
-    if (line.type === MATCH_LINE_TYPE) {
+    if (l.type === MATCH_LINE_TYPE) {
      matchLineIndex = index;
    } else {
-      Object.assign(line, {
-        oldLine: bottom ? oldLineNumber + index + 1 : oldLineNumber + index - lineCount,
-        newLine: bottom ? newLineNumber + index + 1 : newLineNumber + index - lineCount,
+      Object.assign(l, {
+        old_line: bottom ? oldLineNumber + index + 1 : oldLineNumber + index - lineCount,
+        new_line: bottom ? newLineNumber + index + 1 : newLineNumber + index - lineCount,
      });
    }

-    return line;
+    return l;
  });

  if (matchLineIndex > -1) {
@ -146,9 +143,9 @@ export function addLineReferences(lines, lineNumbers, bottom) {
      : linesWithNumbers[matchLineIndex + 1];

    Object.assign(line, {
-      metaData: {
-        oldPos: targetLine.oldLine,
-        newPos: targetLine.newLine,
+      meta_data: {
+        old_pos: targetLine.old_line,
+        new_pos: targetLine.new_line,
      },
    });
  }
@ -187,11 +184,11 @@ export function trimFirstCharOfLineContent(line = {}) {

  const parsedLine = Object.assign({}, line);

-  if (line.richText) {
-    const firstChar = parsedLine.richText.charAt(0);
+  if (line.rich_text) {
+    const firstChar = parsedLine.rich_text.charAt(0);

    if (firstChar === ' ' || firstChar === '+' || firstChar === '-') {
-      parsedLine.richText = line.richText.substring(1);
+      parsedLine.rich_text = line.rich_text.substring(1);
    }
  }

@ -201,15 +198,15 @@ export function trimFirstCharOfLineContent(line = {}) {
 // This prepares and optimizes the incoming diff data from the server
 // by setting up incremental rendering and removing unneeded data
 export function prepareDiffData(diffData) {
-  const filesLength = diffData.diffFiles.length;
+  const filesLength = diffData.diff_files.length;
  let showingLines = 0;
  for (let i = 0; i < filesLength; i += 1) {
-    const file = diffData.diffFiles[i];
+    const file = diffData.diff_files[i];

-    if (file.parallelDiffLines) {
-      const linesLength = file.parallelDiffLines.length;
+    if (file.parallel_diff_lines) {
+      const linesLength = file.parallel_diff_lines.length;
      for (let u = 0; u < linesLength; u += 1) {
-        const line = file.parallelDiffLines[u];
+        const line = file.parallel_diff_lines[u];
        if (line.left) {
          line.left = trimFirstCharOfLineContent(line.left);
        }
@ -219,13 +216,13 @@ export function prepareDiffData(diffData) {
      }
    }

-    if (file.highlightedDiffLines) {
-      const linesLength = file.highlightedDiffLines.length;
+    if (file.highlighted_diff_lines) {
+      const linesLength = file.highlighted_diff_lines.length;
      for (let u = 0; u < linesLength; u += 1) {
-        const line = file.highlightedDiffLines[u];
+        const line = file.highlighted_diff_lines[u];
        Object.assign(line, { ...trimFirstCharOfLineContent(line) });
      }
-      showingLines += file.parallelDiffLines.length;
+      showingLines += file.parallel_diff_lines.length;
    }

    Object.assign(file, {
@ -238,26 +235,21 @@ export function prepareDiffData(diffData) {

 export function getDiffPositionByLineCode(diffFiles) {
  return diffFiles.reduce((acc, diffFile) => {
-    const { baseSha, headSha, startSha } = diffFile.diffRefs;
-    const { newPath, oldPath } = diffFile;
-
    // We can only use highlightedDiffLines to create the map of diff lines because
    // highlightedDiffLines will also include every parallel diff line in it.
-    if (diffFile.highlightedDiffLines) {
-      diffFile.highlightedDiffLines.forEach(line => {
-        const { lineCode, oldLine, newLine } = line;
-
-        if (lineCode) {
-          acc[lineCode] = {
-            baseSha,
-            headSha,
-            startSha,
-            newPath,
-            oldPath,
-            oldLine,
-            newLine,
-            lineCode,
-            positionType: 'text',
+    if (diffFile.highlighted_diff_lines) {
+      diffFile.highlighted_diff_lines.forEach(line => {
+        if (line.line_code) {
+          acc[line.line_code] = {
+            base_sha: diffFile.diff_refs.base_sha,
+            head_sha: diffFile.diff_refs.head_sha,
+            start_sha: diffFile.diff_refs.start_sha,
+            new_path: diffFile.new_path,
+            old_path: diffFile.old_path,
+            old_line: line.old_line,
+            new_line: line.new_line,
+            line_code: line.line_code,
+            position_type: 'text',
          };
        }
      });
@ -270,30 +262,30 @@ export function getDiffPositionByLineCode(diffFiles) {
 // This method will check whether the discussion is still applicable
 // to the diff line in question regarding different versions of the MR
 export function isDiscussionApplicableToLine({ discussion, diffPosition, latestDiff }) {
-  const { lineCode, ...diffPositionCopy } = diffPosition;
+  const { line_code, ...diffPositionCopy } = diffPosition;

  if (discussion.original_position && discussion.position) {
-    const originalRefs = convertObjectPropsToCamelCase(discussion.original_position);
-    const refs = convertObjectPropsToCamelCase(discussion.position);
+    const originalRefs = discussion.original_position;
+    const refs = discussion.position;

    return _.isEqual(refs, diffPositionCopy) || _.isEqual(originalRefs, diffPositionCopy);
  }

-  return latestDiff && discussion.active && lineCode === discussion.line_code;
+  // eslint-disable-next-line
+  return latestDiff && discussion.active && line_code === discussion.line_code;
 }

 export const generateTreeList = files =>
  files.reduce(
    (acc, file) => {
-      const { fileHash, addedLines, removedLines, newFile, deletedFile, newPath } = file;
-      const split = newPath.split('/');
+      const split = file.new_path.split('/');

      split.forEach((name, i) => {
        const parent = acc.treeEntries[split.slice(0, i).join('/')];
        const path = `${parent ? `${parent.path}/` : ''}${name}`;

        if (!acc.treeEntries[path]) {
-          const type = path === newPath ? 'blob' : 'tree';
+          const type = path === file.new_path ? 'blob' : 'tree';
          acc.treeEntries[path] = {
            key: path,
            path,
@ -307,11 +299,11 @@ export const generateTreeList = files =>
          if (type === 'blob') {
            Object.assign(entry, {
              changed: true,
-              tempFile: newFile,
-              deleted: deletedFile,
-              fileHash,
-              addedLines,
-              removedLines,
+              tempFile: file.new_file,
+              deleted: file.deleted_file,
+              fileHash: file.file_hash,
+              addedLines: file.added_lines,
+              removedLines: file.removed_lines,
            });
          } else {
            Object.assign(entry, {
@ -329,6 +321,6 @@ export const generateTreeList = files =>
  );

 export const getDiffMode = diffFile => {
-  const diffModeKey = Object.keys(diffModes).find(key => diffFile[`${key}File`]);
+  const diffModeKey = Object.keys(diffModes).find(key => diffFile[`${key}_file`]);
  return diffModes[diffModeKey] || diffModes.replaced;
 };
--- a/app/assets/javascripts/environments/components/container.vue
+++ b/app/assets/javascripts/environments/components/container.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import tablePagination from '../../vue_shared/components/table_pagination.vue';
 import environmentTable from '../components/environments_table.vue';

--- a/app/assets/javascripts/environments/components/environment_actions.vue
+++ b/app/assets/javascripts/environments/components/environment_actions.vue
@ -4,7 +4,7 @@ import { formatTime } from '~/lib/utils/datetime_utility';
 import Icon from '~/vue_shared/components/icon.vue';
 import eventHub from '../event_hub';
 import tooltip from '../../vue_shared/directives/tooltip';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  directives: {
--- a/app/assets/javascripts/environments/components/environment_external_url.vue
+++ b/app/assets/javascripts/environments/components/environment_external_url.vue
@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import { s__ } from '~/locale';

--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@ -1,7 +1,7 @@
 <script>
 import Timeago from 'timeago.js';
 import _ from 'underscore';
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import { humanize } from '~/lib/utils/text_utility';
 import Icon from '~/vue_shared/components/icon.vue';
--- a/app/assets/javascripts/environments/components/environment_monitoring.vue
+++ b/app/assets/javascripts/environments/components/environment_monitoring.vue
@ -2,7 +2,7 @@
 /**
 * Renders the Monitoring (Metrics) link in environments table.
 */
-import { GlButton, GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlButton, GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';

 export default {
--- a/app/assets/javascripts/environments/components/environment_rollback.vue
+++ b/app/assets/javascripts/environments/components/environment_rollback.vue
@ -6,7 +6,7 @@
 * Makes a post request when the button is clicked.
 */
 import { s__ } from '~/locale';
-import { GlTooltipDirective, GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective, GlLoadingIcon } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import eventHub from '../event_hub';

@ -63,7 +63,7 @@ export default {
  >
    <icon
      v-if="isLastDeployment"
-      name="repeat" 
+      name="repeat"
    />
    <icon
      v-else
--- a/app/assets/javascripts/environments/components/environment_stop.vue
+++ b/app/assets/javascripts/environments/components/environment_stop.vue
@ -5,7 +5,7 @@
 */

 import $ from 'jquery';
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 import { s__ } from '~/locale';
 import eventHub from '../event_hub';
--- a/app/assets/javascripts/environments/components/environment_terminal_button.vue
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.vue
@ -3,7 +3,7 @@
 * Renders a terminal button to open a web terminal.
 * Used in environments table.
 */
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';

 export default {
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@ -2,7 +2,7 @@
 /**
 * Render environments table.
 */
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import environmentItem from './environment_item.vue';

 export default {
--- a/app/assets/javascripts/environments/components/stop_environment_modal.vue
+++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue
@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective } from '@gitlab/ui';
 import GlModal from '~/vue_shared/components/gl_modal.vue';
 import { s__, sprintf } from '~/locale';
 import LoadingButton from '~/vue_shared/components/loading_button.vue';
--- a/app/assets/javascripts/files_comment_button.js
+++ b/app/assets/javascripts/files_comment_button.js
@ -1,5 +1,5 @@
 /* Developer beware! Do not add logic to showButton or hideButton
- * that will force a reflow. Doing so will create a signficant performance
+ * that will force a reflow. Doing so will create a significant performance
 * bottleneck for pages with large diffs. For a comprehensive list of what
 * causes reflows, visit https://gist.github.com/paulirish/5d52fb081b3570c81e3a
 */
--- a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
@ -135,10 +135,6 @@ export default class FilteredSearchVisualTokens {
  }

  static updateUserTokenAppearance(tokenValueContainer, tokenValueElement, tokenValue) {
-    if (tokenValue === 'none') {
-      return Promise.resolve();
-    }
-
    const username = tokenValue.replace(/^@/, '');
    return (
      UsersCache.retrieve(username)
@ -184,7 +180,12 @@ export default class FilteredSearchVisualTokens {
    const tokenValueElement = tokenValueContainer.querySelector('.value');
    tokenValueElement.innerText = tokenValue;

+    if (tokenValue === 'none' || tokenValue === 'any') {
+      return;
+    }
+
    const tokenType = tokenName.toLowerCase();
+
    if (tokenType === 'label') {
      FilteredSearchVisualTokens.updateLabelTokenColor(tokenValueContainer, tokenValue);
    } else if (tokenType === 'author' || tokenType === 'assignee') {
--- a/app/assets/javascripts/frequent_items/components/app.vue
+++ b/app/assets/javascripts/frequent_items/components/app.vue
@ -1,7 +1,7 @@
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
 import AccessorUtilities from '~/lib/utils/accessor';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../event_hub';
 import store from '../store/';
 import { FREQUENT_ITEMS, STORAGE_KEY } from '../constants';
--- a/app/assets/javascripts/groups/components/app.vue
+++ b/app/assets/javascripts/groups/components/app.vue
@ -8,7 +8,7 @@ import { HIDDEN_CLASS } from '~/lib/utils/constants';
 import { getParameterByName } from '~/lib/utils/common_utils';
 import { mergeUrlParams } from '~/lib/utils/url_utility';

-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../event_hub';
 import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants';
 import groupsComponent from './groups.vue';
--- a/app/assets/javascripts/ide/components/branches/search_list.vue
+++ b/app/assets/javascripts/ide/components/branches/search_list.vue
@ -2,7 +2,7 @@
 import { mapActions, mapState } from 'vuex';
 import _ from 'underscore';
 import Icon from '~/vue_shared/components/icon.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import Item from './item.vue';

 export default {
--- a/app/assets/javascripts/ide/components/error_message.vue
+++ b/app/assets/javascripts/ide/components/error_message.vue
@ -1,6 +1,6 @@
 <script>
 import { mapActions } from 'vuex';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/ide/components/file_templates/dropdown.vue
+++ b/app/assets/javascripts/ide/components/file_templates/dropdown.vue
@ -2,7 +2,7 @@
 import $ from 'jquery';
 import { mapActions, mapState } from 'vuex';
 import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/ide/components/ide_side_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_side_bar.vue
@ -1,6 +1,6 @@
 <script>
 import { mapState, mapGetters } from 'vuex';
-import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
+import { GlSkeletonLoading } from '@gitlab/ui';
 import IdeTree from './ide_tree.vue';
 import ResizablePanel from './resizable_panel.vue';
 import ActivityBar from './activity_bar.vue';
--- a/app/assets/javascripts/ide/components/ide_tree_list.vue
+++ b/app/assets/javascripts/ide/components/ide_tree_list.vue
@ -1,7 +1,7 @@
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
 import Icon from '~/vue_shared/components/icon.vue';
-import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
+import { GlSkeletonLoading } from '@gitlab/ui';
 import FileRow from '~/vue_shared/components/file_row.vue';
 import NavDropdown from './nav_dropdown.vue';
 import FileRowExtra from './file_row_extra.vue';
--- a/app/assets/javascripts/ide/components/jobs/list.vue
+++ b/app/assets/javascripts/ide/components/jobs/list.vue
@ -1,6 +1,6 @@
 <script>
 import { mapActions } from 'vuex';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import Stage from './stage.vue';

 export default {
--- a/app/assets/javascripts/ide/components/jobs/stage.vue
+++ b/app/assets/javascripts/ide/components/jobs/stage.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import tooltip from '../../../vue_shared/directives/tooltip';
 import Icon from '../../../vue_shared/components/icon.vue';
 import CiIcon from '../../../vue_shared/components/ci_icon.vue';
--- a/app/assets/javascripts/ide/components/merge_requests/list.vue
+++ b/app/assets/javascripts/ide/components/merge_requests/list.vue
@ -3,7 +3,7 @@ import { mapActions, mapState } from 'vuex';
 import _ from 'underscore';
 import { __ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import Item from './item.vue';
 import TokenedInput from '../shared/tokened_input.vue';

--- a/app/assets/javascripts/ide/components/pipelines/list.vue
+++ b/app/assets/javascripts/ide/components/pipelines/list.vue
@ -1,7 +1,7 @@
 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
 import _ from 'underscore';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import { sprintf, __ } from '../../../locale';
 import Icon from '../../../vue_shared/components/icon.vue';
 import CiIcon from '../../../vue_shared/components/ci_icon.vue';
--- a/app/assets/javascripts/ide/components/preview/clientside.vue
+++ b/app/assets/javascripts/ide/components/preview/clientside.vue
@ -3,7 +3,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import _ from 'underscore';
 import { Manager } from 'smooshpack';
 import { listen } from 'codesandbox-api';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import Navigator from './navigator.vue';
 import { packageJsonPath } from '../../constants';
 import { createPathWithExt } from '../../utils';
--- a/app/assets/javascripts/ide/components/preview/navigator.vue
+++ b/app/assets/javascripts/ide/components/preview/navigator.vue
@ -1,7 +1,7 @@
 <script>
 import { listen } from 'codesandbox-api';
 import Icon from '~/vue_shared/components/icon.vue';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js
+++ b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js
@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => {
    dispatch(
      'setErrorMessage',
      {
-        text: __('An error occured whilst fetching the latest pipline.'),
+        text: __('An error occured whilst fetching the latest pipeline.'),
        action: () =>
          dispatch('forcePipelineRequest').then(() =>
            dispatch('setErrorMessage', null, { root: true }),
--- a/app/assets/javascripts/jobs/components/artifacts_block.vue
+++ b/app/assets/javascripts/jobs/components/artifacts_block.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';

--- a/app/assets/javascripts/jobs/components/commit_block.vue
+++ b/app/assets/javascripts/jobs/components/commit_block.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';

 export default {
--- a/app/assets/javascripts/jobs/components/empty_state.vue
+++ b/app/assets/javascripts/jobs/components/empty_state.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/jobs/components/erased_block.vue
+++ b/app/assets/javascripts/jobs/components/erased_block.vue
@ -1,6 +1,6 @@
 <script>
 import _ from 'underscore';
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';
 import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';

 export default {
--- a/app/assets/javascripts/jobs/components/job_app.vue
+++ b/app/assets/javascripts/jobs/components/job_app.vue
@ -1,7 +1,7 @@
 <script>
 import _ from 'underscore';
 import { mapGetters, mapState, mapActions } from 'vuex';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import { isScrolledToBottom } from '~/lib/utils/scroll_utils';
 import { polyfillSticky } from '~/lib/utils/sticky';
 import bp from '~/breakpoints';
--- a/app/assets/javascripts/jobs/components/job_container_item.vue
+++ b/app/assets/javascripts/jobs/components/job_container_item.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';
 import tooltip from '~/vue_shared/directives/tooltip';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import Icon from '~/vue_shared/components/icon.vue';
--- a/app/assets/javascripts/jobs/components/job_log_controllers.vue
+++ b/app/assets/javascripts/jobs/components/job_log_controllers.vue
@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective, GlLink, GlButton } from '@gitlab-org/gitlab-ui';
+import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui';
 import { polyfillSticky } from '~/lib/utils/sticky';
 import Icon from '~/vue_shared/components/icon.vue';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@ -1,7 +1,7 @@
 <script>
 import _ from 'underscore';
 import { mapActions, mapState } from 'vuex';
-import { GlLink, GlButton } from '@gitlab-org/gitlab-ui';
+import { GlLink, GlButton } from '@gitlab/ui';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
 import Icon from '~/vue_shared/components/icon.vue';
--- a/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';

 export default {
  name: 'SidebarDetailRow',
--- a/app/assets/javascripts/jobs/components/stuck_block.vue
+++ b/app/assets/javascripts/jobs/components/stuck_block.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLink } from '@gitlab-org/gitlab-ui';
+import { GlLink } from '@gitlab/ui';
 /**
 * Renders Stuck Runners block for job's view.
 */
--- a/app/assets/javascripts/jobs/components/trigger_block.vue
+++ b/app/assets/javascripts/jobs/components/trigger_block.vue
@ -1,5 +1,5 @@
 <script>
-import { GlButton } from '@gitlab-org/gitlab-ui';
+import { GlButton } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/jobs/store/actions.js
+++ b/app/assets/javascripts/jobs/store/actions.js
@ -80,8 +80,8 @@ export const fetchJob = ({ state, dispatch }) => {
 export const receiveJobSuccess = ({ commit }, data = {}) => {
  commit(types.RECEIVE_JOB_SUCCESS, data);

-  if (data.favicon) {
-    setFaviconOverlay(data.favicon);
+  if (data.status && data.status.favicon) {
+    setFaviconOverlay(data.status.favicon);
  } else {
    resetFavicon();
  }
--- a/app/assets/javascripts/jobs/store/getters.js
+++ b/app/assets/javascripts/jobs/store/getters.js
@ -42,7 +42,7 @@ export const emptyStateIllustration = state =>
  (state.job && state.job.status && state.job.status.illustration) || {};

 export const emptyStateAction = state =>
-  (state.job && state.job.status && state.job.status.action) || {};
+  (state.job && state.job.status && state.job.status.action) || null;

 export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;

--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@ -16,7 +16,7 @@ import 'vendor/jquery.atwho';
 import AjaxCache from '~/lib/utils/ajax_cache';
 import Vue from 'vue';
 import syntaxHighlight from '~/syntax_highlight';
-import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
+import { GlSkeletonLoading } from '@gitlab/ui';
 import axios from './lib/utils/axios_utils';
 import { getLocationHash } from './lib/utils/url_utility';
 import Flash from './flash';
--- a/app/assets/javascripts/notes/components/diff_with_note.vue
+++ b/app/assets/javascripts/notes/components/diff_with_note.vue
@ -1,10 +1,9 @@
 <script>
 import { mapState, mapActions } from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
 import DiffViewer from '~/vue_shared/components/diff_viewer/diff_viewer.vue';
 import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue';
-import { GlSkeletonLoading } from '@gitlab-org/gitlab-ui';
+import { GlSkeletonLoading } from '@gitlab/ui';
 import { trimFirstCharOfLineContent, getDiffMode } from '~/diffs/store/utils';

 export default {
@ -34,7 +33,9 @@ export default {
      return getDiffMode(this.diffFile);
    },
    hasTruncatedDiffLines() {
-      return this.discussion.truncatedDiffLines && this.discussion.truncatedDiffLines.length !== 0;
+      return (
+        this.discussion.truncated_diff_lines && this.discussion.truncated_diff_lines.length !== 0
+      );
    },
    isDiscussionsExpanded() {
      return true; // TODO: @fatihacet - Fix this.
@ -50,19 +51,17 @@ export default {
      return text ? 'text-file' : 'js-image-file';
    },
    diffFile() {
-      return convertObjectPropsToCamelCase(this.discussion.diffFile, { deep: true });
+      return this.discussion.diff_file;
    },
    imageDiffHtml() {
-      return this.discussion.imageDiffHtml;
+      return this.discussion.image_diff_html;
    },
    userColorScheme() {
      return window.gon.user_color_scheme;
    },
    normalizedDiffLines() {
-      if (this.discussion.truncatedDiffLines) {
-        return this.discussion.truncatedDiffLines.map(line =>
-          trimFirstCharOfLineContent(convertObjectPropsToCamelCase(line)),
-        );
+      if (this.discussion.truncated_diff_lines) {
+        return this.discussion.truncated_diff_lines.map(line => trimFirstCharOfLineContent(line));
      }

      return [];
@ -97,7 +96,7 @@ export default {
    class="diff-file file-holder"
  >
    <diff-file-header
-      :discussion-path="discussion.discussionPath"
+      :discussion-path="discussion.discussion_path"
      :diff-file="diffFile"
      :can-current-user-fork="false"
      :discussions-expanded="isDiscussionsExpanded"
@ -111,15 +110,15 @@ export default {
      <table>
        <tr
          v-for="line in normalizedDiffLines"
-          :key="line.lineCode"
+          :key="line.line_code"
          class="line_holder"
        >
-          <td class="diff-line-num old_line">{{ line.oldLine }}</td>
-          <td class="diff-line-num new_line">{{ line.newLine }}</td>
+          <td class="diff-line-num old_line">{{ line.old_line }}</td>
+          <td class="diff-line-num new_line">{{ line.new_line }}</td>
          <td
            :class="line.type"
            class="line_content"
-            v-html="line.richText"
+            v-html="line.rich_text"
          >
          </td>
        </tr>
@ -165,17 +164,17 @@ export default {
    >
      <diff-viewer
        :diff-mode="diffMode"
-        :new-path="diffFile.newPath"
-        :new-sha="diffFile.diffRefs.headSha"
-        :old-path="diffFile.oldPath"
-        :old-sha="diffFile.diffRefs.baseSha"
-        :file-hash="diffFile.fileHash"
+        :new-path="diffFile.new_path"
+        :new-sha="diffFile.diff_refs.head_sha"
+        :old-path="diffFile.old_path"
+        :old-sha="diffFile.diff_refs.base_sha"
+        :file-hash="diffFile.file_hash"
        :project-path="projectPath"
      >
        <image-diff-overlay
          slot="image-overlay"
          :discussions="discussion"
-          :file-hash="diffFile.fileHash"
+          :file-hash="diffFile.file_hash"
          :show-comment-icon="true"
          :should-toggle-discussion="false"
          badge-class="image-comment-badge"
--- a/app/assets/javascripts/notes/components/note_actions.vue
+++ b/app/assets/javascripts/notes/components/note_actions.vue
@ -2,7 +2,7 @@
 import { mapGetters } from 'vuex';
 import Icon from '~/vue_shared/components/icon.vue';
 import tooltip from '~/vue_shared/directives/tooltip';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';

 export default {
  name: 'NoteActions',
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@ -1,6 +1,5 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { truncateSha } from '~/lib/utils/text_utility';
 import { s__ } from '~/locale';
 import systemNote from '~/vue_shared/components/notes/system_note.vue';
@ -88,17 +87,16 @@ export default {
    transformedDiscussion() {
      return {
        ...this.discussion.notes[0],
-        truncatedDiffLines: this.discussion.truncated_diff_lines || [],
-        truncatedDiffLinesPath: this.discussion.truncated_diff_lines_path,
-        diffFile: this.discussion.diff_file,
-        diffDiscussion: this.discussion.diff_discussion,
-        imageDiffHtml: this.discussion.image_diff_html,
+        truncated_diff_lines: this.discussion.truncated_diff_lines || [],
+        truncated_diff_lines_path: this.discussion.truncated_diff_lines_path,
+        diff_file: this.discussion.diff_file,
+        diff_discussion: this.discussion.diff_discussion,
        active: this.discussion.active,
-        discussionPath: this.discussion.discussion_path,
+        discussion_path: this.discussion.discussion_path,
        resolved: this.discussion.resolved,
-        resolvedBy: this.discussion.resolved_by,
-        resolvedByPush: this.discussion.resolved_by_push,
-        resolvedAt: this.discussion.resolved_at,
+        resolved_by: this.discussion.resolved_by,
+        resolved_by_push: this.discussion.resolved_by_push,
+        resolved_at: this.discussion.resolved_at,
      };
    },
    author() {
@ -138,7 +136,7 @@ export default {
      return null;
    },
    resolvedText() {
-      return this.transformedDiscussion.resolvedByPush ? 'Automatically resolved' : 'Resolved';
+      return this.transformedDiscussion.resolved_by_push ? 'Automatically resolved' : 'Resolved';
    },
    hasMultipleUnresolvedDiscussions() {
      return this.unresolvedDiscussions.length > 1;
@ -150,12 +148,14 @@ export default {
      );
    },
    shouldRenderDiffs() {
-      const { diffDiscussion, diffFile } = this.transformedDiscussion;
-
-      return diffDiscussion && diffFile && this.renderDiffFile;
+      return (
+        this.transformedDiscussion.diff_discussion &&
+        this.transformedDiscussion.diff_file &&
+        this.renderDiffFile
+      );
    },
    shouldGroupReplies() {
-      return !this.shouldRenderDiffs && !this.transformedDiscussion.diffDiscussion;
+      return !this.shouldRenderDiffs && !this.transformedDiscussion.diff_discussion;
    },
    shouldRenderHeader() {
      return this.shouldRenderDiffs;
@ -165,7 +165,7 @@ export default {
    },
    wrapperComponentProps() {
      if (this.shouldRenderDiffs) {
-        return { discussion: convertObjectPropsToCamelCase(this.discussion) };
+        return { discussion: this.discussion };
      }

      return {};
@ -184,8 +184,8 @@ export default {
    },
    shouldShowDiscussions() {
      const isExpanded = this.discussion.expanded;
-      const { diffDiscussion, resolved } = this.transformedDiscussion;
-      const isResolvedNonDiffDiscussion = !diffDiscussion && resolved;
+      const { resolved } = this.transformedDiscussion;
+      const isResolvedNonDiffDiscussion = !this.transformedDiscussion.diff_discussion && resolved;

      return isExpanded || this.alwaysExpanded || isResolvedNonDiffDiscussion;
    },
@ -333,9 +333,9 @@ Please check your network connection and try again.`;
              :expanded="discussion.expanded"
              @toggleHandler="toggleDiscussionHandler"
            >
-              <template v-if="transformedDiscussion.diffDiscussion">
+              <template v-if="transformedDiscussion.diff_discussion">
                started a discussion on
-                <a :href="transformedDiscussion.discussionPath">
+                <a :href="transformedDiscussion.discussion_path">
                  <template v-if="transformedDiscussion.active">
                    the diff
                  </template>
@ -356,8 +356,8 @@ Please check your network connection and try again.`;
            </note-header>
            <note-edited-text
              v-if="transformedDiscussion.resolved"
-              :edited-at="transformedDiscussion.resolvedAt"
-              :edited-by="transformedDiscussion.resolvedBy"
+              :edited-at="transformedDiscussion.resolved_at"
+              :edited-by="transformedDiscussion.resolved_by"
              :action-text="resolvedText"
              class-name="discussion-headline-light js-discussion-headline"
            />
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@ -341,7 +341,7 @@ export const scrollToNoteIfNeeded = (context, el) => {
 };

 export const fetchDiscussionDiffLines = ({ commit }, discussion) =>
-  axios.get(discussion.truncatedDiffLinesPath).then(({ data }) => {
+  axios.get(discussion.truncated_diff_lines_path).then(({ data }) => {
    commit(types.SET_DISCUSSION_DIFF_LINES, {
      discussionId: discussion.id,
      diffLines: data.truncated_diff_lines,
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@ -102,7 +102,7 @@ export default {
    discussionsData.forEach(discussion => {
      if (discussion.diff_file) {
        Object.assign(discussion, {
-          fileHash: discussion.diff_file.file_hash,
+          file_hash: discussion.diff_file.file_hash,
          truncated_diff_lines: discussion.truncated_diff_lines || [],
        });
      }
@ -195,7 +195,7 @@ export default {
    const selectedDiscussion = state.discussions.find(disc => disc.id === note.id);
    note.expanded = true; // override expand flag to prevent collapse
    if (note.diff_file) {
-      Object.assign(note, { fileHash: note.diff_file.file_hash });
+      Object.assign(note, { file_hash: note.diff_file.file_hash });
    }
    Object.assign(selectedDiscussion, { ...note });
  },
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@ -1,7 +1,7 @@
 <script>
 import _ from 'underscore';
 import { s__, sprintf } from '~/locale';
-import { GlModal, GlModalDirective } from '@gitlab-org/gitlab-ui';
+import { GlModal, GlModalDirective } from '@gitlab/ui';

 export default {
  components: {
--- a/app/assets/javascripts/pipelines/components/empty_state.vue
+++ b/app/assets/javascripts/pipelines/components/empty_state.vue
@ -1,5 +1,5 @@
 <script>
-import { GlButton } from '@gitlab-org/gitlab-ui';
+import { GlButton } from '@gitlab/ui';

 export default {
  name: 'PipelinesEmptyState',
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@ -1,10 +1,9 @@
 <script>
-import $ from 'jquery';
+import { GlTooltipDirective, GlButton } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import { dasherize } from '~/lib/utils/text_utility';
 import { __ } from '~/locale';
 import createFlash from '~/flash';
-import tooltip from '~/vue_shared/directives/tooltip';
 import Icon from '~/vue_shared/components/icon.vue';

 /**
@ -20,23 +19,20 @@ import Icon from '~/vue_shared/components/icon.vue';
 export default {
  components: {
    Icon,
+    GlButton,
  },
-
  directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
  },
-
  props: {
    tooltipText: {
      type: String,
      required: true,
    },
-
    link: {
      type: String,
      required: true,
    },
-
    actionIcon: {
      type: String,
      required: true,
@ -47,7 +43,6 @@ export default {
      isDisabled: false,
    };
  },
-
  computed: {
    cssClass() {
      const actionIconDash = dasherize(this.actionIcon);
@ -62,8 +57,7 @@ export default {
     *
     */
    onClickAction() {
-      $(this.$el).tooltip('hide');
-
+      this.$root.$emit('bv::hide::tooltip', `js-ci-action-${this.link}`);
      this.isDisabled = true;

      axios
@ -82,18 +76,16 @@ export default {
 };
 </script>
 <template>
-  <button
-    v-tooltip
+  <gl-button
+    :id="`js-ci-action-${link}`"
+    v-gl-tooltip="{ boundary: 'viewport' }"
    :title="tooltipText"
    :class="cssClass"
    :disabled="isDisabled"
-    type="button"
    class="js-ci-action btn btn-blank
 btn-transparent ci-action-icon-container ci-action-icon-wrapper"
-    data-container="body"
-    data-boundary="viewport"
    @click="onClickAction"
  >
    <icon :name="actionIcon"/>
-  </button>
+  </gl-button>
 </template>
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@ -1,6 +1,6 @@
 <script>
 import _ from 'underscore';
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import StageColumnComponent from './stage_column_component.vue';

 export default {
--- a/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_group_dropdown.vue
@ -1,8 +1,8 @@
 <script>
 import $ from 'jquery';
+import { GlTooltipDirective } from '@gitlab/ui';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import JobItem from './job_item.vue';
-import tooltip from '../../../vue_shared/directives/tooltip';

 /**
 * Renders the dropdown for the pipeline graph.
@ -12,32 +12,27 @@ import tooltip from '../../../vue_shared/directives/tooltip';
 */
 export default {
  directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
  },
-
  components: {
    JobItem,
    CiIcon,
  },
-
  props: {
    group: {
      type: Object,
      required: true,
    },
  },
-
  computed: {
    tooltipText() {
      const { name, status } = this.group;
      return `${name} - ${status.label}`;
    },
  },
-
  mounted() {
    this.stopDropdownClickPropagation();
  },
-
  methods: {
    /**
     * When the user right clicks or cmd/ctrl + click in the group name or the action icon
@ -65,12 +60,10 @@ export default {
 <template>
  <div class="ci-job-dropdown-container dropdown dropright">
    <button
-      v-tooltip
+      v-gl-tooltip.hover="{ boundary: 'viewport' }"
      :title="tooltipText"
      type="button"
      data-toggle="dropdown"
-      data-container="body"
-      data-boundary="viewport"
      data-display="static"
      class="dropdown-menu-toggle build-content"
    >
--- a/app/assets/javascripts/pipelines/components/graph/job_item.vue
+++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue
@ -1,7 +1,7 @@
 <script>
 import ActionComponent from './action_component.vue';
 import JobNameComponent from './job_name_component.vue';
-import tooltip from '../../../vue_shared/directives/tooltip';
+import { GlTooltipDirective, GlLink } from '@gitlab/ui';
 import { sprintf } from '~/locale';
 import delayedJobMixin from '~/jobs/mixins/delayed_job_mixin';

@ -34,9 +34,10 @@ export default {
  components: {
    ActionComponent,
    JobNameComponent,
+    GlLink,
  },
  directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
  },
  mixins: [delayedJobMixin],
  props: {
@ -55,7 +56,6 @@ export default {
      default: Infinity,
    },
  },
-
  computed: {
    status() {
      return this.job && this.job.status ? this.job.status : {};
@ -88,7 +88,6 @@ export default {
    tooltipBoundary() {
      return this.dropdownLength < 5 ? 'viewport' : null;
    },
-
    /**
     * Verifies if the provided job has an action path
     *
@ -98,7 +97,6 @@ export default {
      return this.job.status && this.job.status.action && this.job.status.action.path;
    },
  },
-
  methods: {
    pipelineActionRequestComplete() {
      this.$emit('pipelineActionRequestComplete');
@ -108,30 +106,26 @@ export default {
 </script>
 <template>
  <div class="ci-job-component">
-    <a
+    <gl-link
      v-if="status.has_details"
-      v-tooltip
+      v-gl-tooltip="{ boundary: tooltipBoundary }"
      :href="status.details_path"
      :title="tooltipText"
      :class="cssClassJobName"
-      :data-boundary="tooltipBoundary"
-      data-container="body"
      class="js-pipeline-graph-job-link"
    >
-
      <job-name-component
        :name="job.name"
        :status="job.status"
      />
-    </a>
+    </gl-link>

    <div
      v-else
-      v-tooltip
+      v-gl-tooltip
      :title="tooltipText"
      :class="cssClassJobName"
      class="js-job-component-tooltip non-details-job-component"
-      data-container="body"
    >

      <job-name-component
--- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
@ -13,34 +13,28 @@ export default {
      type: String,
      required: true,
    },
-
    groups: {
      type: Array,
      required: true,
    },
-
    isFirstColumn: {
      type: Boolean,
      required: false,
      default: false,
    },
-
    stageConnectorClass: {
      type: String,
      required: false,
      default: '',
    },
  },
-
  methods: {
    groupId(group) {
      return `ci-badge-${_.escape(group.name)}`;
    },
-
    buildConnnectorClass(index) {
      return index === 0 && !this.isFirstColumn ? 'left-connector' : '';
    },
-
    pipelineActionRequestComplete() {
      this.$emit('refreshPipelineGraph');
    },
@ -50,7 +44,8 @@ export default {
 <template>
  <li
    :class="stageConnectorClass"
-    class="stage-column">
+    class="stage-column"
+  >
    <div class="stage-name">
      {{ title }}
    </div>
@ -78,7 +73,6 @@ export default {
            :group="group"
            @pipelineActionRequestComplete="pipelineActionRequestComplete"
          />
-
        </li>
      </ul>
    </div>
--- a/app/assets/javascripts/pipelines/components/header_component.vue
+++ b/app/assets/javascripts/pipelines/components/header_component.vue
@ -1,5 +1,5 @@
 <script>
-import { GlLoadingIcon } from '@gitlab-org/gitlab-ui';
+import { GlLoadingIcon } from '@gitlab/ui';
 import ciHeader from '../../vue_shared/components/header_ci_component.vue';
 import eventHub from '../event_hub';

--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .11.3
 .13.0
 @ -1 +1 @@
 .4.5
 .5.3
 @ -1 +1 @@
 .129.0
 .132.0
 @ -1 +1 @@
 .1.0
 .1.1