Compare revisions

ff274277 · ff274277 · ff274277 · ff274277 · ff274277 · ff274277
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,41 +2,40 @@ GEM
  remote: https://rubygems.org/
  specs:
    RedCloth (4.3.2)
-    ace-rails-ap (4.1.0)
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    ace-rails-ap (4.1.2)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
      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 (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
      arel (~> 6.0)
    activerecord_sane_schema_dumper (0.2)
      rails (>= 4, < 5)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
@@ -47,14 +46,14 @@ GEM
      activerecord (>= 3.0)
    akismet (2.0.0)
    allocations (1.0.5)
-    arel (6.0.3)
-    asana (0.4.0)
+    arel (6.0.4)
+    asana (0.6.0)
      faraday (~> 0.9)
      faraday_middleware (~> 0.9)
      faraday_middleware-multi_json (~> 0.0)
      oauth2 (~> 1.0)
    asciidoctor (1.5.3)
-    asciidoctor-plantuml (0.0.6)
+    asciidoctor-plantuml (0.0.7)
      asciidoctor (~> 1.5)
    ast (2.3.0)
    attr_encrypted (3.0.3)
@@ -72,26 +71,24 @@ GEM
      descendants_tracker (~> 0.0.4)
      ice_nine (~> 0.11.0)
      thread_safe (~> 0.3, >= 0.3.1)
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
    babosa (1.0.2)
    base32 (0.3.2)
    bcrypt (3.1.11)
    benchmark-ips (2.3.0)
-    better_errors (1.0.1)
+    better_errors (2.1.1)
      coderay (>= 1.0.0)
      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    bindata (2.3.5)
    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
    bootstrap-sass (3.3.6)
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
-    brakeman (3.4.1)
+    brakeman (3.6.1)
    browser (2.2.0)
-    builder (3.2.2)
-    bullet (5.2.0)
+    builder (3.2.3)
+    bullet (5.5.1)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.10.0)
    bundler-audit (0.5.0)
@@ -105,13 +102,12 @@ GEM
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
      xpath (~> 2.0)
-    capybara-screenshot (1.0.11)
+    capybara-screenshot (1.0.14)
      capybara (>= 1.0, < 3)
      launchy
-    carrierwave (0.10.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.0.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
    cause (0.1)
    charlock_holmes (0.7.3)
@@ -119,8 +115,9 @@ GEM
    chronic_duration (0.10.6)
      numerizer (~> 0.1.1)
    chunky_png (1.3.5)
+    citrus (3.0.2)
    cliver (0.3.2)
-    coderay (1.1.0)
+    coderay (1.1.1)
    coercible (1.0.0)
      descendants_tracker (~> 0.0.1)
    coffee-rails (4.1.1)
@@ -131,7 +128,7 @@ GEM
      execjs
    coffee-script-source (1.10.0)
    colorize (0.7.7)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
    connection_pool (2.2.1)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
@@ -171,6 +168,9 @@ GEM
      unf (>= 0.0.5, < 1.0.0)
    doorkeeper (4.2.0)
      railties (>= 4.2)
+    doorkeeper-openid_connect (1.1.2)
+      doorkeeper (~> 4.0)
+      json-jwt (~> 1.6)
    dropzonejs-rails (0.7.2)
      rails (> 3.1)
    email_reply_trimmer (0.1.6)
@@ -181,8 +181,10 @@ GEM
    equalizer (0.0.11)
    erubis (2.7.0)
    escape_utils (1.1.1)
+    et-orbi (1.0.3)
+      tzinfo
    eventmachine (1.0.8)
-    excon (0.52.0)
+    excon (0.55.0)
    execjs (2.6.0)
    expression_parser (0.9.0)
    extlib (0.9.16)
@@ -191,27 +193,30 @@ GEM
    factory_girl_rails (4.7.0)
      factory_girl (~> 4.7.0)
      railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.11.0)
      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
    faraday_middleware-multi_json (0.0.6)
      faraday_middleware
      multi_json
+    fast_gettext (1.4.0)
    ffaker (2.4.0)
    ffi (1.9.10)
-    flay (2.6.1)
+    flay (2.8.1)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
      ruby_parser (~> 3.0)
      sexp_processor (~> 4.0)
    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
-    fog-aws (0.11.0)
+    fog-aws (0.13.0)
      fog-core (~> 1.38)
      fog-json (~> 1.0)
      fog-xml (~> 0.1)
      ipaddress (~> 0.8)
-    fog-core (1.42.0)
+    fog-core (1.44.1)
      builder
      excon (~> 0.49)
      formatador (~> 0.2)
@@ -233,10 +238,10 @@ GEM
      fog-json (>= 1.0)
      fog-xml (>= 0.1)
      ipaddress (>= 0.8)
-    fog-xml (0.1.2)
+    fog-xml (0.1.3)
      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.6.1.0)
+      nokogiri (>= 1.5.11, < 2.0.0)
+    font-awesome-rails (4.7.0.1)
      railties (>= 3.2, < 5.1)
    foreman (0.78.0)
      thor (~> 0.19.1)
@@ -249,7 +254,20 @@ GEM
    gemojione (3.0.1)
      json
    get_process_mem (0.2.0)
+    gettext (3.2.2)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext_i18n_rails (1.8.0)
+      fast_gettext (>= 0.9.0)
+    gettext_i18n_rails_js (1.2.0)
+      gettext (>= 3.0.2)
+      gettext_i18n_rails (>= 0.7.1)
+      po_to_json (>= 1.0.0)
+      rails (>= 3.2.0)
    gherkin-ruby (0.3.2)
+    gitaly (0.7.0)
+      google-protobuf (~> 3.1)
+      grpc (~> 1.0)
    github-linguist (4.7.6)
      charlock_holmes (~> 0.7.3)
      escape_utils (~> 1.1.0)
@@ -266,8 +284,6 @@ GEM
      mime-types (>= 1.16, < 3)
      posix-spawn (~> 0.3)
    gitlab-markup (1.5.1)
-    gitlab-turbolinks-classic (2.5.6)
-      coffee-rails
    gitlab_omniauth-ldap (1.2.1)
      net-ldap (~> 0.9)
      omniauth (~> 1.0)
@@ -284,9 +300,9 @@ GEM
      rouge (~> 2.0)
      sanitize (~> 2.1.0)
      stringex (~> 2.5.1)
-    gollum-rugged_adapter (0.4.2)
+    gollum-rugged_adapter (0.4.4)
      mime-types (>= 1.15)
-      rugged (~> 0.24.0, >= 0.21.3)
+      rugged (~> 0.25)
    gon (6.1.0)
      actionpack (>= 3.0)
      json
@@ -303,6 +319,7 @@ GEM
      multi_json (~> 1.10)
      retriable (~> 1.4)
      signet (~> 0.6)
+    google-protobuf (3.2.0.2)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)
@@ -311,7 +328,7 @@ GEM
      multi_json (~> 1.11)
      os (~> 0.9)
      signet (~> 0.7)
-    grape (0.18.0)
+    grape (0.19.1)
      activesupport
      builder
      hashie (>= 2.1.0)
@@ -324,19 +341,25 @@ GEM
    grape-entity (0.6.0)
      activesupport
      multi_json (>= 1.3.2)
+    grpc (1.2.5)
+      google-protobuf (~> 3.1)
+      googleauth (~> 0.5.1)
    haml (4.0.7)
      tilt
-    haml_lint (0.18.2)
+    haml_lint (0.21.0)
      haml (~> 4.0)
-      rake (>= 10, < 12)
-      rubocop (>= 0.36.0)
+      rake (>= 10, < 13)
+      rubocop (>= 0.47.0)
      sysexits (~> 1.1)
    hamlit (2.6.1)
      temple (~> 0.7.6)
      thor
      tilt
-    hashie (3.4.4)
-    health_check (2.2.1)
+    hashdiff (0.3.2)
+    hashie (3.5.5)
+    hashie-forbidden_attributes (0.1.1)
+      hashie (>= 3.0)
+    health_check (2.6.0)
      rails (>= 4.0)
    hipchat (1.5.2)
      httparty
@@ -360,8 +383,8 @@ GEM
      json (~> 1.8)
      multi_xml (>= 0.5.2)
    httpclient (2.8.2)
-    i18n (0.7.0)
-    ice_nine (0.11.1)
+    i18n (0.8.1)
+    ice_nine (0.11.2)
    influxdb (0.2.3)
      cause
      json
@@ -374,12 +397,16 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
-      railties (>= 3.2.16)
-    json (1.8.3)
+    json (1.8.6)
+    json-jwt (1.7.1)
+      activesupport
+      bindata
+      multi_json (>= 1.3)
+      securecompare
+      url_safe_base64
    json-schema (2.6.2)
      addressable (~> 2.3.8)
-    jwt (1.5.4)
+    jwt (1.5.6)
    kaminari (0.17.0)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
@@ -405,17 +432,18 @@ GEM
      rubyzip
      thor
      xml-simple
-    licensee (8.0.0)
-      rugged (>= 0.24b)
+    licensee (8.7.0)
+      rugged (~> 0.24)
    little-plugger (1.1.4)
-    logging (2.1.0)
+    locale (2.1.2)
+    logging (2.2.2)
      little-plugger (~> 1.1)
      multi_json (~> 1.10)
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
      mime-types (>= 1.16, < 4)
-    mail_room (0.9.0)
+    mail_room (0.9.1)
    memoist (0.15.0)
    method_source (0.8.2)
    mime-types (2.99.3)
@@ -424,7 +452,7 @@ GEM
    minitest (5.7.0)
    mousetrap-rails (1.4.6)
    multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
    multipart-post (2.0.0)
    mustermann (0.4.0)
      tool (~> 0.2)
@@ -434,27 +462,25 @@ GEM
    net-ldap (0.12.1)
    net-ssh (3.0.1)
    netrc (0.11.0)
-    newrelic_rpm (3.16.0.318)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
    numerizer (0.1.1)
    oauth (0.5.1)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
      jwt (~> 1.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
    octokit (4.6.2)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (2.17.4)
-    omniauth (1.3.2)
+    oj (2.17.5)
+    omniauth (1.4.2)
      hashie (>= 1.2, < 4)
      rack (>= 1.0, < 3)
    omniauth-auth0 (1.4.1)
      omniauth-oauth2 (~> 1.1)
-    omniauth-authentiq (0.2.2)
+    omniauth-authentiq (0.3.0)
      omniauth-oauth2 (~> 1.3, >= 1.3.1)
    omniauth-azure-oauth2 (0.0.6)
      jwt (~> 1.0)
@@ -489,6 +515,8 @@ GEM
    omniauth-oauth2 (1.3.1)
      oauth2 (~> 1.0)
      omniauth (~> 1.2)
+    omniauth-oauth2-generic (0.2.2)
+      omniauth-oauth2 (~> 1.0)
    omniauth-saml (1.7.0)
      omniauth (~> 1.3)
      ruby-saml (~> 1.4)
@@ -507,10 +535,12 @@ GEM
    os (0.9.6)
    paranoia (2.2.0)
      activerecord (>= 4.0, < 5.1)
-    parser (2.3.1.4)
+    parser (2.4.0.0)
      ast (~> 2.2)
+    path_expander (1.0.1)
    pg (0.18.4)
-    pkg-config (1.1.7)
+    po_to_json (1.0.1)
+      json (>= 1.6.0)
    poltergeist (1.9.0)
      capybara (~> 2.1)
      cliver (~> 0.3.1)
@@ -524,14 +554,14 @@ GEM
    premailer-rails (1.9.2)
      actionmailer (>= 3, < 6)
      premailer (~> 1.7, >= 1.7.9)
-    pry (0.10.3)
+    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
-    pry-byebug (3.4.1)
+    pry-byebug (3.4.2)
      byebug (~> 9.0)
      pry (~> 0.10)
-    pry-rails (0.3.4)
+    pry-rails (0.3.5)
      pry (>= 0.9.10)
    pyu-ruby-sasl (0.0.3.3)
    rack (1.6.5)
@@ -548,30 +578,32 @@ GEM
      rack (>= 1.1)
    rack-protection (1.5.3)
      rack
+    rack-proxy (0.6.0)
+      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
+      railties (= 4.2.8)
      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.1.0)
@@ -584,8 +616,8 @@ GEM
    recaptcha (3.0.0)
      json
    recursive-open-struct (1.0.0)
-    redcarpet (3.3.3)
-    redis (3.2.2)
+    redcarpet (3.4.0)
+    redis (3.3.3)
    redis-actionpack (5.0.1)
      actionpack (>= 4.0, < 6)
      redis-rack (>= 1, < 3)
@@ -641,14 +673,20 @@ GEM
      rspec-support (~> 3.5.0)
    rspec-retry (0.4.5)
      rspec-core
+    rspec-set (0.1.3)
    rspec-support (3.5.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rspec_profiling (0.0.5)
+      activerecord
+      pg
+      rails
+      sqlite3
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
      powerpack (~> 0.1)
      rainbow (>= 1.99.1, < 3.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.9.1)
+    rubocop-rspec (1.15.0)
      rubocop (>= 0.42.0)
    ruby-fogbugz (0.2.1)
      crack (~> 0.4)
@@ -656,13 +694,14 @@ GEM
    ruby-progressbar (1.8.1)
    ruby-saml (1.4.1)
      nokogiri (>= 1.5.10)
-    ruby_parser (3.8.2)
+    ruby_parser (3.8.4)
      sexp_processor (~> 4.1)
    rubyntlm (0.5.2)
    rubypants (0.2.0)
-    rubyzip (1.2.0)
-    rufus-scheduler (3.1.10)
-    rugged (0.24.0)
+    rubyzip (1.2.1)
+    rufus-scheduler (3.4.0)
+      et-orbi (~> 1.0)
+    rugged (0.25.1.1)
    safe_yaml (1.0.4)
    sanitize (2.1.0)
      nokogiri (>= 1.4.4)
@@ -679,27 +718,27 @@ GEM
    scss_lint (0.47.1)
      rake (>= 0.9, < 11)
      sass (~> 3.4.15)
+    securecompare (1.0.0)
    seed-fu (2.3.6)
      activerecord (>= 3.1)
      activesupport (>= 3.1)
    select2-rails (3.5.9.3)
      thor (~> 0.14)
-    sentry-raven (2.0.2)
-      faraday (>= 0.7.6, < 0.10.x)
+    sentry-raven (2.4.0)
+      faraday (>= 0.7.6, < 1.0)
    settingslogic (2.0.9)
-    sexp_processor (4.7.0)
+    sexp_processor (4.8.0)
    sham_rack (1.3.6)
      rack
    shoulda-matchers (2.8.0)
      activesupport (>= 3.0.0)
-    sidekiq (4.2.7)
+    sidekiq (5.0.0)
      concurrent-ruby (~> 1.0)
      connection_pool (~> 2.2, >= 2.2.0)
      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    sidekiq-cron (0.4.4)
-      redis-namespace (>= 1.5.2)
-      rufus-scheduler (>= 2.0.24)
+      redis (~> 3.3, >= 3.3.3)
+    sidekiq-cron (0.6.0)
+      rufus-scheduler (>= 3.3.0)
      sidekiq (>= 4.2.1)
    sidekiq-limit_fetch (3.4.0)
      sidekiq (>= 4)
@@ -708,7 +747,7 @@ GEM
      faraday (~> 0.9)
      jwt (~> 1.5)
      multi_json (~> 1.10)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
      docile (~> 1.1.0)
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
@@ -725,24 +764,20 @@ GEM
      spinach (>= 0.4)
    spinach-rerun-reporter (0.0.2)
      spinach (~> 0.8)
-    spring (1.7.2)
+    spring (2.0.1)
+      activesupport (>= 4.2)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    spring-commands-spinach (1.1.0)
      spring (>= 0.9.1)
-    spring-commands-teaspoon (0.0.2)
-      spring (>= 0.9.1)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-es6 (0.9.2)
-      babel-source (>= 5.8.11)
-      babel-transpiler
-      sprockets (>= 3.0.0)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
    stackprof (0.2.10)
    state_machines (0.4.0)
    state_machines-activemodel (0.4.0)
@@ -755,22 +790,21 @@ GEM
    sys-filesystem (1.1.6)
      ffi
    sysexits (1.2.0)
-    teaspoon (1.1.5)
-      railties (>= 3.2.5, < 6)
-    teaspoon-jasmine (2.2.0)
-      teaspoon (>= 1.0.0)
    temple (0.7.7)
-    test_after_commit (0.4.2)
+    test_after_commit (1.1.0)
      activerecord (>= 3.2)
+    text (1.3.1)
    thin (1.7.0)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0, >= 1.0.4)
      rack (>= 1, < 3)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.6)
    timecop (0.8.1)
    timfel-krb5-auth (0.8.3)
+    toml-rb (0.3.15)
+      citrus (~> 3.0, > 3.0)
    tool (0.2.3)
    truncato (0.7.8)
      htmlentities (~> 4.3.1)
@@ -785,7 +819,7 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.7.2)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.3)
    unicorn (5.1.0)
      kgio (~> 2.6)
      raindrops (~> 0.7)
@@ -793,6 +827,10 @@ GEM
      get_process_mem (~> 0)
      unicorn (>= 4, < 6)
    uniform_notifier (1.10.0)
+    url_safe_base64 (0.2.2)
+    validates_hostname (1.0.6)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
    version_sorter (2.1.0)
    virtus (1.0.5)
      axiom-types (~> 0.1)
@@ -802,14 +840,12 @@ GEM
    vmstat (2.3.0)
    warden (1.2.6)
      rack (>= 1.0)
-    web-console (2.3.0)
-      activemodel (>= 4.0)
-      binding_of_caller (>= 0.7.2)
-      railties (>= 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-    webmock (1.21.0)
+    webmock (1.24.6)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
+      hashdiff
+    webpack-rails (0.9.10)
+      railties (>= 3.2.0)
    websocket-driver (0.6.3)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.2)
@@ -833,28 +869,29 @@ DEPENDENCIES
  after_commit_queue (~> 1.3.0)
  akismet (~> 2.0)
  allocations (~> 1.0)
-  asana (~> 0.4.0)
+  asana (~> 0.6.0)
  asciidoctor (~> 1.5.2)
-  asciidoctor-plantuml (= 0.0.6)
+  asciidoctor-plantuml (= 0.0.7)
  attr_encrypted (~> 3.0.0)
  awesome_print (~> 1.2.0)
  babosa (~> 1.0.2)
  base32 (~> 0.3.0)
  benchmark-ips (~> 2.3.0)
-  better_errors (~> 1.0.1)
+  better_errors (~> 2.1.0)
  binding_of_caller (~> 0.7.2)
  bootstrap-sass (~> 3.3.0)
-  brakeman (~> 3.4.0)
+  brakeman (~> 3.6.0)
  browser (~> 2.2)
-  bullet (~> 5.2.0)
+  bullet (~> 5.5.0)
  bundler-audit (~> 0.5.0)
  capybara (~> 2.6.2)
  capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 0.10.0)
+  carrierwave (~> 1.0)
  charlock_holmes (~> 0.7.3)
  chronic (~> 0.10.2)
  chronic_duration (~> 0.10.6)
  coffee-rails (~> 4.1.0)
+  concurrent-ruby (~> 1.0.5)
  connection_pool (~> 2.0)
  creole (~> 0.5.0)
  d3_rails (~> 3.5.0)
@@ -865,37 +902,43 @@ DEPENDENCIES
  devise-two-factor (~> 3.0.0)
  diffy (~> 3.1.0)
  doorkeeper (~> 4.2.0)
+  doorkeeper-openid_connect (~> 1.1.0)
  dropzonejs-rails (~> 0.7.1)
  email_reply_trimmer (~> 0.1)
  email_spec (~> 1.6.0)
  factory_girl_rails (~> 4.7.0)
+  faraday (~> 0.11.0)
  ffaker (~> 2.4)
-  flay (~> 2.6.1)
+  flay (~> 2.8.0)
  fog-aws (~> 0.9)
-  fog-core (~> 1.40)
+  fog-core (~> 1.44)
  fog-google (~> 0.5)
  fog-local (~> 0.3)
  fog-openstack (~> 0.1)
  fog-rackspace (~> 0.1.1)
-  font-awesome-rails (~> 4.6.1)
+  font-awesome-rails (~> 4.7)
  foreman (~> 0.78.0)
  fuubar (~> 2.0.0)
  gemnasium-gitlab-service (~> 0.2)
  gemojione (~> 3.0)
+  gettext (~> 3.2.2)
+  gettext_i18n_rails (~> 1.8.0)
+  gettext_i18n_rails_js (~> 1.2.0)
+  gitaly (~> 0.7.0)
  github-linguist (~> 4.7.0)
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-markup (~> 1.5.1)
-  gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.2)
-  gollum-rugged_adapter (~> 0.4.2)
+  gollum-rugged_adapter (~> 0.4.4)
  gon (~> 6.1.0)
  google-api-client (~> 0.8.6)
-  grape (~> 0.18.0)
+  grape (~> 0.19.0)
  grape-entity (~> 0.6.0)
-  haml_lint (~> 0.18.2)
+  haml_lint (~> 0.21.0)
  hamlit (~> 2.6.1)
-  health_check (~> 2.2.0)
+  hashie-forbidden_attributes
+  health_check (~> 2.6.0)
  hipchat (~> 1.5.0)
  html-pipeline (~> 1.11.0)
  html2text
@@ -904,30 +947,28 @@ DEPENDENCIES
  jira-ruby (~> 1.1.2)
  jquery-atwho-rails (~> 1.3.2)
  jquery-rails (~> 4.1.0)
-  jquery-ui-rails (~> 5.0.0)
  json-schema (~> 2.6.2)
-  jwt
+  jwt (~> 1.5.6)
  kaminari (~> 0.17.0)
  knapsack (~> 1.11.0)
  kubeclient (~> 2.2.0)
  letter_opener_web (~> 1.3.0)
  license_finder (~> 2.1.0)
-  licensee (~> 8.0.0)
+  licensee (~> 8.7.0)
  loofah (~> 2.0.3)
-  mail_room (~> 0.9.0)
+  mail_room (~> 0.9.1)
  method_source (~> 0.8)
  minitest (~> 5.7.0)
  mousetrap-rails (~> 1.4.6)
  mysql2 (~> 0.3.16)
  net-ssh (~> 3.0.1)
-  newrelic_rpm (~> 3.16)
  nokogiri (~> 1.6.7, >= 1.6.7.2)
-  oauth2 (~> 1.2.0)
+  oauth2 (~> 1.3.0)
  octokit (~> 4.6.2)
  oj (~> 2.17.4)
-  omniauth (~> 1.3.2)
+  omniauth (~> 1.4.2)
  omniauth-auth0 (~> 1.4.1)
-  omniauth-authentiq (~> 0.2.0)
+  omniauth-authentiq (~> 0.3.0)
  omniauth-azure-oauth2 (~> 0.0.6)
  omniauth-cas3 (~> 1.1.2)
  omniauth-facebook (~> 4.0.0)
@@ -935,6 +976,7 @@ DEPENDENCIES
  omniauth-gitlab (~> 1.0.2)
  omniauth-google-oauth2 (~> 0.4.1)
  omniauth-kerberos (~> 0.3.0)
+  omniauth-oauth2-generic (~> 0.2.2)
  omniauth-saml (~> 1.7.0)
  omniauth-shibboleth (~> 1.2.0)
  omniauth-twitter (~> 1.2.0)
@@ -949,13 +991,14 @@ DEPENDENCIES
  rack-attack (~> 4.4.1)
  rack-cors (~> 0.4.0)
  rack-oauth2 (~> 1.2.1)
-  rails (= 4.2.7.1)
+  rack-proxy (~> 0.6.0)
+  rails (= 4.2.8)
  rails-deprecated_sanitizer (~> 1.0.3)
  rainbow (~> 2.1.0)
  rblineprof (~> 0.3.6)
  rdoc (~> 4.2)
  recaptcha (~> 3.0)
-  redcarpet (~> 3.3.3)
+  redcarpet (~> 3.4)
  redis (~> 3.2)
  redis-namespace (~> 1.5.2)
  redis-rails (~> 5.0.1)
@@ -965,41 +1008,42 @@ DEPENDENCIES
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.5.0)
  rspec-retry (~> 0.4.5)
-  rubocop (~> 0.46.0)
-  rubocop-rspec (~> 1.9.1)
+  rspec-set (~> 0.1.3)
+  rspec_profiling (~> 0.0.5)
+  rubocop (~> 0.47.1)
+  rubocop-rspec (~> 1.15.0)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 0.16.2)
-  rugged (~> 0.24.0)
+  ruby_parser (~> 3.8.4)
+  rufus-scheduler (~> 3.4)
+  rugged (~> 0.25.1.1)
  sanitize (~> 2.0)
  sass-rails (~> 5.0.6)
  scss_lint (~> 0.47.0)
  seed-fu (~> 2.3.5)
  select2-rails (~> 3.5.9)
-  sentry-raven (~> 2.0.0)
+  sentry-raven (~> 2.4.0)
  settingslogic (~> 2.0.9)
  sham_rack (~> 1.3.6)
  shoulda-matchers (~> 2.8.0)
-  sidekiq (~> 4.2.7)
-  sidekiq-cron (~> 0.4.4)
+  sidekiq (~> 5.0)
+  sidekiq-cron (~> 0.6.0)
  sidekiq-limit_fetch (~> 3.4)
-  simplecov (= 0.12.0)
+  simplecov (~> 0.14.0)
  slack-notifier (~> 1.5.1)
  spinach-rails (~> 0.2.1)
  spinach-rerun-reporter (~> 0.0.2)
-  spring (~> 1.7.0)
+  spring (~> 2.0.0)
  spring-commands-rspec (~> 1.0.4)
  spring-commands-spinach (~> 1.1.0)
-  spring-commands-teaspoon (~> 0.0.2)
  sprockets (~> 3.7.0)
-  sprockets-es6 (~> 0.9.2)
  stackprof (~> 0.2.10)
  state_machines-activerecord (~> 0.4.0)
  sys-filesystem (~> 1.1.6)
-  teaspoon (~> 1.1.0)
-  teaspoon-jasmine (~> 2.2.0)
-  test_after_commit (~> 0.4.2)
+  test_after_commit (~> 1.1)
  thin (~> 1.7.0)
  timecop (~> 0.8.0)
+  toml-rb (~> 0.3.15)
  truncato (~> 0.7.8)
  u2f (~> 0.2.1)
  uglifier (~> 2.7.2)
@@ -1007,12 +1051,13 @@ DEPENDENCIES
  unf (~> 0.1.4)
  unicorn (~> 5.1.0)
  unicorn-worker-killer (~> 0.4.4)
+  validates_hostname (~> 1.0.6)
  version_sorter (~> 2.1.0)
  virtus (~> 1.0.1)
  vmstat (~> 2.3.0)
-  web-console (~> 2.0)
-  webmock (~> 1.21.0)
+  webmock (~> 1.24.0)
+  webpack-rails (~> 0.9.10)
  wikicloth (= 0.8.1)
  
 BUNDLED WITH
-   1.13.7
+   1.14.6
--- a/LICENSE
+++ b/LICENSE
-Copyright (c) 2011-2016 GitLab B.V.
+Copyright (c) 2011-2017 GitLab B.V.
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

--- a/PROCESS.md
+++ b/PROCESS.md
-# GitLab Contributing Process
+## GitLab Core Team & GitLab Inc. Contribution Process
+
+---
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [Purpose of describing the contributing process](#purpose-of-describing-the-contributing-process)
+- [Common actions](#common-actions)
+  - [Merge request coaching](#merge-request-coaching)
+- [Assigning issues](#assigning-issues)
+- [Be kind](#be-kind)
+- [Feature freeze on the 7th for the release on the 22nd](#feature-freeze-on-the-7th-for-the-release-on-the-22nd)
+  - [Between the 1st and the 7th](#between-the-1st-and-the-7th)
+  - [On the 7th](#on-the-7th)
+  - [After the 7th](#after-the-7th)
+- [Release retrospective and kickoff](#release-retrospective-and-kickoff)
+  - [Retrospective](#retrospective)
+  - [Kickoff](#kickoff)
+- [Copy & paste responses](#copy--paste-responses)
+  - [Improperly formatted issue](#improperly-formatted-issue)
+  - [Issue report for old version](#issue-report-for-old-version)
+  - [Support requests and configuration questions](#support-requests-and-configuration-questions)
+  - [Code format](#code-format)
+  - [Issue fixed in newer version](#issue-fixed-in-newer-version)
+  - [Improperly formatted merge request](#improperly-formatted-merge-request)
+  - [Inactivity close of an issue](#inactivity-close-of-an-issue)
+  - [Inactivity close of a merge request](#inactivity-close-of-a-merge-request)
+  - [Accepting merge requests](#accepting-merge-requests)
+  - [Only accepting merge requests with green tests](#only-accepting-merge-requests-with-green-tests)
+  - [Closing down the issue tracker on GitHub](#closing-down-the-issue-tracker-on-github)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+---
  
 ## Purpose of describing the contributing process
  
-Below we describe the contributing process to GitLab for two reasons. So that
-contributors know what to expect from maintainers (possible responses, friendly
-treatment, etc.). And so that maintainers know what to expect from contributors
-(use the latest version, ensure that the issue is addressed, friendly treatment,
-etc.).
+Below we describe the contributing process to GitLab for two reasons:
+
+1. Contributors know what to expect from maintainers (possible responses, friendly
+  treatment, etc.)
+1. Maintainers know what to expect from contributors (use the latest version,
+  ensure that the issue is addressed, friendly treatment, etc.).
  
 - [GitLab Inc engineers should refer to the engineering workflow document](https://about.gitlab.com/handbook/engineering/workflow/)
  
 ## Common actions
  
-### Issue team
-
- Looks for issues without [workflow labels](#how-we-handle-issues) and triages
-  issue
- Closes invalid issues with a comment (duplicates,
-  [fixed in newer version](#issue-fixed-in-newer-version),
-  [issue report for old version](#issue-report-for-old-version), not a problem
-  in GitLab, etc.)
- Asks for feedback from issue reporter
-  ([invalid issue reports](#improperly-formatted-issue),
-  [format code](#code-format), etc.)
- Monitors all issues for feedback (but especially ones commented on since
-  automatically watching them)
- Closes issues with no feedback from the reporter for two weeks
-
-### Merge marshall & merge request coach
-
- Responds to merge requests the issue team mentions them in and monitors for
-  new merge requests
- Provides feedback to the merge request submitter to improve the merge request
-  (style, tests, etc.)
- Mark merge requests `Ready for Merge` when they meet the
-  [contribution acceptance criteria]
- Mention developer(s) based on the
-  [list of members and their specialities][team]
- Closes merge requests with no feedback from the reporter for two weeks
-
-## Priorities of the issue team
-
-1. Mentioning people (critical)
-1. Workflow labels (normal)
-1. Functional labels (minor)
-1. Assigning issues (avoid if possible)
-
-## Mentioning people
-
-The most important thing is making sure valid issues receive feedback from the
-development team. Therefore the priority is mentioning developers that can help
-on those issues. Please select someone with relevant experience from
-[GitLab core team][core-team]. If there is nobody mentioned with that expertise
-look in the commit history for the affected files to find someone. Avoid
-mentioning the lead developer, this is the person that is least likely to give a
-timely response. If the involvement of the lead developer is needed the other
-core team members will mention this person.
-
-## Workflow labels
-
-Workflow labels are purposely not very detailed since that would be hard to keep
-updated as you would need to re-evaluate them after every comment. We optionally
-use functional labels on demand when we want to group related issues to get an
-overview (for example all issues related to RVM, to tackle them in one go) and
-to add details to the issue.
-
- ~"Awaiting Feedback" Feedback pending from the reporter
- ~UX needs help from a UX designer
- ~Frontend needs help from a Front-end engineer. Please follow the
-  ["Implement design & UI elements" guidelines].
- ~"Accepting Merge Requests" is a low priority, well-defined issue that we
-  encourage people to contribute to. Not exclusive with other labels.
- ~"feature proposal" is a proposal for a new feature for GitLab. People are encouraged to vote
-in support or comment for further detail. Do not use `feature request`.
- ~bug is an issue reporting undesirable or incorrect behavior.
- ~customer is an issue reported by enterprise subscribers. This label should
-be accompanied by *bug* or *feature proposal* labels.
-
-Example workflow: when a UX designer provided a design but it needs frontend work they remove the UX label and add the frontend label.
-
-## Functional labels
-
-These labels describe what development specialities are involved such as: `CI`,
-`Core`, `Documentation`, `Frontend`, `Issues`, `Merge Requests`, `Omnibus`,
-`Release`, `Repository`, `UX`.
+### Merge request coaching
  
-## Assigning issues
+Several people from the [GitLab team][team] are helping community members to get
+their contributions accepted by meeting our [Definition of done][done].
  
-If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover.
+What you can expect from them is described at https://about.gitlab.com/jobs/merge-request-coach/.
  
-## Label colors
+## Assigning issues
  
- Light orange `#fef2c0`: workflow labels for issue team members (awaiting
-  feedback, awaiting confirmation of fix)
- Bright orange `#eb6420`: workflow labels for core team members (attached MR,
-  awaiting developer action/feedback)
- Light blue `#82C5FF`: functional labels
- Green labels `#009800`: issues that can generally be ignored. For example,
-  issues given the following labels normally can be closed immediately:
-  - Support (see copy & paste response:
-    [Support requests and configuration questions](#support-requests-and-configuration-questions)
+If an issue is complex and needs the attention of a specific person, assignment is a good option but assigning issues might discourage other people from contributing to that issue. We need all the contributions we can get so this should never be discouraged. Also, an assigned person might not have time for a few weeks, so others should feel free to takeover.
  
 ## Be kind
  
 Be kind to people trying to contribute. Be aware that people may be a non-native
 English speaker, they might not understand things or they might be very
 sensitive as to how you word things. Use Emoji to express your feelings (heart,
-star, smile, etc.). Some good tips about giving feedback to merge requests is in
-the [Thoughtbot code review guide].
+star, smile, etc.). Some good tips about code reviews can be found in our
+[Code Review Guidelines].
+
+[Code Review Guidelines]: https://docs.gitlab.com/ce/development/code_review.html
+
+## Feature freeze on the 7th for the release on the 22nd
+
+After the 7th (Pacific Standard Time Zone) of each month, RC1 of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com and the stable branch for this release is frozen, which means master is no longer merged into it.
+Merge requests may still be merged into master during this period,
+but they will go into the _next_ release, unless they are manually cherry-picked into the stable branch.
+By freezing the stable branches 2 weeks prior to a release, we reduce the risk of a last minute merge request potentially breaking things.
+
+### Between the 1st and the 7th
+
+These types of merge requests for the upcoming release need special consideration:
+
+* **Large features**: a large feature is one that is highlighted in the kick-off
+  and the release blogpost; typically this will have its own channel in Slack
+  and a dedicated team with front-end, back-end, and UX.
+* **Small features**: any other feature request.
+
+**Large features** must be with a maintainer **by the 1st**. This means that:
+
+* There is a merge request (even if it's WIP).
+* The person (or people, if it needs a frontend and backend maintainer) who will
+  ultimately be responsible for merging this have been pinged on the MR.
+
+It's OK if merge request isn't completely done, but this allows the maintainer
+enough time to make the decision about whether this can make it in before the
+freeze. If the maintainer doesn't think it will make it, they should inform the
+developers working on it and the Product Manager responsible for the feature.
+
+The maintainer can also choose to assign a reviewer to perform an initial
+review, but this way the maintainer is unlikely to be surprised by receiving an
+MR later in the cycle.
+
+**Small features** must be with a reviewer (not necessarily maintainer) **by the
+3rd**.
  
-## Feature Freeze
+Most merge requests from the community do not have a specific release
+target. However, if one does and falls into either of the above categories, it's
+the reviewer's responsibility to manage the above communication and assignment
+on behalf of the community member.
  
-5 working days before the 22nd the stable branches for the upcoming release will
-be frozen for major changes. Merge requests may still be merged into master
-during this period. By freezing the stable branches prior to a release there's
-no need to worry about last minute merge requests potentially breaking a lot of
-things.
+### On the 7th
  
-What is considered to be a major change is determined on a case by case basis as
-this definition depends very much on the context of changes. For example, a 5
-line change might have a big impact on the entire application. Ultimately the
-decision will be made by those reviewing a merge request and the release
-manager.
+Merge requests should still be complete, following the
+[definition of done][done]. The single exception is documentation, and this can
+only be left until after the freeze if:
  
-During the feature freeze all merge requests that are meant to go into the next
+* There is a follow-up issue to add documentation.
+* It is assigned to the person writing documentation for this feature, and they
+  are aware of it.
+* It is in the correct milestone, with the ~Deliverable label.
+
+All Community Edition merge requests from GitLab team members merged on the
+freeze date (the 7th) should have a corresponding Enterprise Edition merge
+request, even if there are no conflicts. This is to reduce the size of the
+subsequent EE merge, as we often merge a lot to CE on the release date. For more
+information, see
+[limit conflicts with EE when developing on CE][limit_ee_conflicts].
+
+### After the 7th
+
+Once the stable branch is frozen, only fixes for regressions (bugs introduced in that same release)
+and security issues will be cherry-picked into the stable branch.
+Any merge requests cherry-picked into the stable branch for a previous release will also be picked into the latest stable branch.
+These fixes will be shipped in the next RC for that release if it is before the 22nd.
+If the fixes are are completed on or after the 22nd, they will be shipped in a patch for that release.
+
+If you think a merge request should go into an RC or patch even though it does not meet these requirements,
+you can ask for an exception to be made. Exceptions require sign-off from 3 people besides the developer:
+
+1. a Release Manager
+2. an Engineering Lead
+3. an Engineering Director, the VP of Engineering, or the CTO
+
+You can find who is who on the [team page](https://about.gitlab.com/team/).
+
+Whether an exception is made is determined by weighing the benefit and urgency of the change
+(how important it is to the company that this is released _right now_ instead of in a month)
+against the potential negative impact
+(things breaking without enough time to comfortably find and fix them before the release on the 22nd).
+When in doubt, we err on the side of _not_ cherry-picking.
+
+For example, it is likely that an exception will be made for a trivial 1-5 line performance improvement
+(e.g. adding a database index or adding `includes` to a query), but not for a new feature, no matter how relatively small or thoroughly tested.
+
+During the feature freeze all merge requests that are meant to go into the upcoming
 release should have the correct milestone assigned _and_ have the label
-~"Pick into Stable" set. Merge requests without a milestone and this label will
+~"Pick into Stable" set, so that release managers can find and pick them.
+Merge requests without a milestone and this label will
 not be merged into any stable branches.
  
+## Release retrospective and kickoff
+
+### Retrospective
+
+After each release, we have a retrospective call where we discuss what went well,
+what went wrong, and what we can improve for the next release. The
+[retrospective notes] are public and you are invited to comment on them.
+If you're interested, you can even join the
+[retrospective call][retro-kickoff-call], on the first working day after the
+22nd at 6pm CET / 9am PST.
+
+### Kickoff
+
+Before working on the next release, we have a
+kickoff call to explain what we expect to ship in the next release. The
+[kickoff notes] are public and you are invited to comment on them.
+If you're interested, you can even join the [kickoff call][retro-kickoff-call],
+on the first working day after the 7th at 6pm CET / 9am PST..
+
+[retrospective notes]: https://docs.google.com/document/d/1nEkM_7Dj4bT21GJy0Ut3By76FZqCfLBmFQNVThmW2TY/edit?usp=sharing
+[kickoff notes]: https://docs.google.com/document/d/1ElPkZ90A8ey_iOkTvUs_ByMlwKK6NAB2VOK5835wYK0/edit?usp=sharing
+[retro-kickoff-call]: https://gitlab.zoom.us/j/918821206
+
 ## Copy & paste responses
  
 ### Improperly formatted issue
  
-Thanks for the issue report. Please reformat your issue to conform to the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+Thanks for the issue report. Please reformat your issue to conform to the [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
  
 ### Issue report for old version
  
-Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+Thanks for the issue report but we only support issues for the latest stable version of GitLab. I'm closing this issue but if you still experience this problem in the latest stable version, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
  
 ### Support requests and configuration questions
  
 Thanks for your interest in GitLab. We don't use the issue tracker for support
 requests and configuration questions. Please check our
-\[getting help\]\(https://about.gitlab.com/getting-help/) page to see all of the available
-support options. Also, have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md)
+[getting help](https://about.gitlab.com/getting-help/) page to see all of the available
+support options. Also, have a look at the [contribution guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md)
 for more information.
  
 ### Code format
  
-Please use ``` to format console output, logs, and code as it's very hard to read otherwise.
+Please use \`\`\` to format console output, logs, and code as it's very hard to read otherwise.
  
 ### Issue fixed in newer version
  
-Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please \[upgrade\]\(https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+Thanks for the issue report. This issue has already been fixed in newer versions of GitLab. Due to the size of this project and our limited resources we are only able to support the latest stable release as outlined in our [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker). In order to get this bug fix and enjoy many new features please [upgrade](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update). If you still experience issues at that time please open a new issue following our issue tracker guidelines found in the [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
  
 ### Improperly formatted merge request
  
-Thanks for your interest in improving the GitLab codebase! Please update your merge request according to the \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-request-guidelines).
+Thanks for your interest in improving the GitLab codebase! Please update your merge request according to the [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-request-guidelines).
  
 ### Inactivity close of an issue
  
-It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
+It's been at least 2 weeks (and a new release) since we heard from you. I'm closing this issue but if you still experience this problem, please open a new issue (but also reference the old issue(s)). Make sure to also include the necessary debugging information conforming to the issue tracker guidelines found in our [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker-guidelines).
  
 ### Inactivity close of a merge request
  
-This merge request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the merge request guidelines in our \[contributing guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this merge request.
+This merge request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the merge request guidelines in our [contributing guidelines](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#pull-requests) we will reopen this merge request.
  
 ### Accepting merge requests
  
 Is there an issue on the
-\[issue tracker\]\(https://gitlab.com/gitlab-org/gitlab-ce/issues) that is
+[issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) that is
 similar to this? Could you please link it here?
 Please be aware that new functionality that is not marked
-\[accepting merge requests\]\(https://gitlab.com/gitlab-org/gitlab-ce/issues?milestone_id=&scope=all&sort=created_desc&state=opened&utf8=%E2%9C%93&assignee_id=&author_id=&milestone_title=&label_name=Accepting+Merge+Requests)
+[accepting merge requests](https://gitlab.com/gitlab-org/gitlab-ce/issues?milestone_id=&scope=all&sort=created_desc&state=opened&utf8=%E2%9C%93&assignee_id=&author_id=&milestone_title=&label_name=Accepting+Merge+Requests)
 might not make it into GitLab.
  
 ### Only accepting merge requests with green tests
@@ -187,10 +240,11 @@ rebase with master to see if that solves the issue.
 We are currently in the process of closing down the issue tracker on GitHub, to
 prevent duplication with the GitLab.com issue tracker.
 Since this is an older issue I'll be closing this for now. If you think this is
-still an issue I encourage you to open it on the \[GitLab.com issue tracker\]\(https://gitlab.com/gitlab-org/gitlab-ce/issues).
+still an issue I encourage you to open it on the [GitLab.com issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues).
  
-[core-team]: https://about.gitlab.com/core-team/
 [team]: https://about.gitlab.com/team/
 [contribution acceptance criteria]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#contribution-acceptance-criteria
 ["Implement design & UI elements" guidelines]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#implement-design-ui-elements
 [Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review
+[done]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#definition-of-done
+[limit_ee_conflicts]: https://docs.gitlab.com/ce/development/limit_ee_conflicts.html
--- a/README.md
+++ b/README.md
 # GitLab
  
 [![Build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
-[![CE coverage report](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby)
+[![Overall test coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-ce/pipelines)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
 [![Core Infrastructure Initiative Best Practices](https://bestpractices.coreinfrastructure.org/projects/42/badge)](https://bestpractices.coreinfrastructure.org/projects/42)
+[![Gitter](https://badges.gitter.im/gitlabhq/gitlabhq.svg)](https://gitter.im/gitlabhq/gitlabhq?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+## Test coverage
+
+- [![Ruby coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby) Ruby
+- [![JavaScript coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=rake+karma)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-javascript) JavaScript
  
 ## Canonical source
  
@@ -29,7 +35,7 @@ We're hiring developers, support people, and production engineers all the time,
 There are two editions of GitLab:
  
 - GitLab Community Edition (CE) is available freely under the MIT Expat license.
- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/features/#compare) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).
+- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/products/#compare-options) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/products/).
  
 ## Website
  
@@ -68,7 +74,7 @@ One small thing you also have to do when installing it yourself is to copy the e
  
    cp config/unicorn.rb.example.development config/unicorn.rb
  
-Instructions on how to start GitLab and how to run the tests can be found in the [development section of the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit#development).
+Instructions on how to start GitLab and how to run the tests can be found in the [getting started section of the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit#getting-started).
  
 ## Software stack
  

--- a/VERSION
+++ b/VERSION
-8.17.0-pre
+9.2.0-pre
--- a/a
+++ b/a
+xxxxx
+
+xx
+
+xxx
+
+xxx
\ No newline at end of file
--- a/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_created.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_created.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_failed.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_failed.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_manual.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_manual.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_not_found.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_not_found.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_pending.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_pending.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_running.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_running.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_skipped.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_skipped.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_success.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_success.ico
--- a/app/assets/images/ci_favicons/dev/favicon_status_warning.ico
+++ b/app/assets/images/ci_favicons/dev/favicon_status_warning.ico
--- a/app/assets/images/ci_favicons/favicon_status_canceled.ico
+++ b/app/assets/images/ci_favicons/favicon_status_canceled.ico
--- a/app/assets/images/ci_favicons/favicon_status_created.ico
+++ b/app/assets/images/ci_favicons/favicon_status_created.ico
--- a/app/assets/images/ci_favicons/favicon_status_failed.ico
+++ b/app/assets/images/ci_favicons/favicon_status_failed.ico
--- a/app/assets/images/ci_favicons/favicon_status_manual.ico
+++ b/app/assets/images/ci_favicons/favicon_status_manual.ico
No results found