Rails update to 4.2.4

40ff1318 · Valery Sizov · 913b408c · 40ff1318 · 40ff1318 · 40ff1318
Commit 40ff1318 authored Nov 25, 2015 by Valery Sizov
24 changed files
--- a/Gemfile
+++ b/Gemfile
 source "https://rubygems.org"

-gem 'rails', '4.1.14'
+gem 'rails', '4.2.4'
+
+# Responders respond_to and respond_with
+gem 'responders', '~> 2.0'

 # Specify a sprockets version due to security issue
 # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
@@ -98,6 +101,7 @@ gem 'org-ruby',      '~> 0.9.12'
 gem 'creole',        '~> 0.5.0'
 gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
+gem 'net-ssh',       '~> 3.0.1'

 # Diffs
 gem 'diffy', '~> 3.0.3'
@@ -213,6 +217,7 @@ group :development do
  gem 'rerun', '~> 0.10.0'
  gem 'bullet', require: false
  gem 'rblineprof', platform: :mri, require: false
+  gem 'web-console', '~> 2.0'

  # Better errors handler
  gem 'better_errors', '~> 1.0.1'

--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (2.3.1)
+    CFPropertyList (2.3.2)
    RedCloth (4.2.9)
    ace-rails-ap (2.0.1)
-    actionmailer (4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14)
-      actionview (= 4.1.14)
-      activesupport (= 4.1.14)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
      rack-test (~> 0.6.2)
-    actionview (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
      builder (~> 3.1)
      erubis (~> 2.7.0)
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
      builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
-      arel (~> 5.0.0)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
    activerecord-deprecated_finders (1.0.4)
-    activerecord-session_store (0.1.1)
+    activerecord-session_store (0.1.2)
      actionpack (>= 4.0.0, < 5)
      activerecord (>= 4.0.0, < 5)
      railties (>= 4.0.0, < 5)
@@ -33,31 +42,31 @@ GEM
      activemodel (~> 4.0)
      activesupport (~> 4.0)
      rails-observers (~> 0.1.1)
-    activesupport (4.1.14)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
    acts-as-taggable-on (3.5.0)
      activerecord (>= 3.2, < 5)
    addressable (2.3.8)
-    after_commit_queue (1.1.0)
-      rails (>= 3.0)
+    after_commit_queue (1.3.0)
+      activerecord (>= 3.0)
    annotate (2.6.10)
      activerecord (>= 3.2, <= 4.3)
      rake (~> 10.4)
-    arel (5.0.1.20140414130214)
+    arel (6.0.3)
    asana (0.0.6)
      activeresource (>= 3.2.3)
-    asciidoctor (1.5.2)
+    asciidoctor (1.5.3)
    ast (2.1.0)
    astrolabe (1.3.1)
      parser (~> 2.2)
    attr_encrypted (1.3.4)
      encryptor (>= 1.3.0)
    attr_required (1.0.0)
-    autoprefixer-rails (5.2.1.2)
+    autoprefixer-rails (6.1.1)
      execjs
      json
    awesome_print (1.2.0)
@@ -85,15 +94,15 @@ GEM
      ruby_parser (~> 3.5.0)
      sass (~> 3.0)
      terminal-table (~> 1.4)
-    browser (1.0.0)
+    browser (1.0.1)
    builder (3.2.2)
-    bullet (4.14.9)
+    bullet (4.14.10)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.9.0)
    bundler-audit (0.4.0)
      bundler (~> 1.2)
      thor (~> 0.18)
-    byebug (6.0.2)
+    byebug (8.2.0)
    cal-heatmap-rails (0.0.1)
    capybara (2.4.4)
      mime-types (>= 1.16)
@@ -108,10 +117,25 @@ GEM
      activemodel (>= 3.2.0)
      activesupport (>= 3.2.0)
      json (>= 1.7)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
+    celluloid (0.17.2)
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.5)
+      timers (>= 4.1.1)
    charlock_holmes (0.7.3)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
    cliver (0.3.2)
    coderay (1.1.0)
    coercible (1.0.0)
@@ -122,15 +146,16 @@ GEM
    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
    colorize (0.7.7)
    connection_pool (2.2.0)
-    coveralls (0.8.2)
+    coveralls (0.8.9)
      json (~> 1.8)
      rest-client (>= 1.6.8, < 2)
      simplecov (~> 0.10.0)
      term-ansicolor (~> 1.3)
      thor (~> 0.19.1)
+      tins (~> 1.6.0)
    crack (0.4.2)
      safe_yaml (~> 1.0.0)
    creole (0.5.0)
@@ -153,7 +178,7 @@ GEM
      warden (~> 1.2.3)
    devise-async (0.9.0)
      devise (~> 3.2)
-    devise-two-factor (2.0.0)
+    devise-two-factor (2.0.1)
      activesupport
      attr_encrypted (~> 1.3.2)
      devise (~> 3.5.0)
@@ -162,11 +187,11 @@ GEM
    diff-lcs (1.2.5)
    diffy (3.0.7)
    docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
      unf (>= 0.0.5, < 1.0.0)
    doorkeeper (2.1.4)
      railties (>= 3.2)
-    dropzonejs-rails (0.7.1)
+    dropzonejs-rails (0.7.2)
      rails (> 3.1)
    email_reply_parser (0.5.8)
    email_spec (1.6.0)
@@ -202,7 +227,7 @@ GEM
    flog (4.3.2)
      ruby_parser (~> 3.1, > 3.1.0)
      sexp_processor (~> 4.4)
-    flowdock (0.7.0)
+    flowdock (0.7.1)
      httparty (~> 0.7)
      multi_json
    fog (1.25.0)
@@ -224,13 +249,10 @@ GEM
      fog-core (~> 1.22)
      fog-json
      inflecto (~> 0.0.2)
-    fog-core (1.32.1)
+    fog-core (1.35.0)
      builder
      excon (~> 0.45)
      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
    fog-json (1.0.2)
      fog-core (~> 1.0)
      multi_json (~> 1.10)
@@ -242,10 +264,10 @@ GEM
      fog-core (>= 1.21.0)
      fog-json
      fog-xml (>= 0.0.1)
-    fog-sakuracloud (1.0.1)
+    fog-sakuracloud (1.4.0)
      fog-core
      fog-json
-    fog-softlayer (0.4.7)
+    fog-softlayer (1.0.2)
      fog-core
      fog-json
    fog-terremark (0.1.0)
@@ -260,7 +282,7 @@ GEM
    fog-xml (0.1.2)
      fog-core
      nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.4.0.0)
+    font-awesome-rails (4.5.0.0)
      railties (>= 3.2, < 5.0)
    foreman (0.78.0)
      thor (~> 0.19.1)
@@ -270,11 +292,11 @@ GEM
      ruby-progressbar (~> 1.4)
    gemnasium-gitlab-service (0.2.6)
      rugged (~> 0.21)
-    gemojione (2.0.1)
+    gemojione (2.1.0)
      json
    get_process_mem (0.2.0)
    gherkin-ruby (0.3.2)
-    github-linguist (4.7.0)
+    github-linguist (4.7.2)
      charlock_holmes (~> 0.7.3)
      escape_utils (~> 1.1.0)
      mime-types (>= 1.19)
@@ -289,8 +311,8 @@ GEM
      diff-lcs (~> 1.1)
      mime-types (~> 1.15)
      posix-spawn (~> 0.3)
-    gitlab_emoji (0.1.1)
-      gemojione (~> 2.0)
+    gitlab_emoji (0.2.0)
+      gemojione (~> 2.1)
    gitlab_git (7.2.20)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.7.3)
@@ -302,13 +324,15 @@ GEM
      omniauth (~> 1.0)
      pyu-ruby-sasl (~> 0.0.3.1)
      rubyntlm (~> 0.3)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
    gollum-grit_adapter (1.0.0)
      gitlab-grit (~> 2.7, >= 2.7.1)
    gollum-lib (4.0.3)
      github-markup (~> 1.3.3)
      gollum-grit_adapter (~> 1.0)
      nokogiri (~> 1.6.4)
-      rouge (~> 1.10.1)
+      rouge (~> 1.7.4)
      sanitize (~> 2.1.0)
      stringex (~> 2.5.1)
    gon (6.0.1)
@@ -337,7 +361,7 @@ GEM
      haml (>= 4.0.6, < 5.0)
      html2haml (>= 1.0.1)
      railties (>= 4.0.1)
-    hashie (3.4.2)
+    hashie (3.4.3)
    highline (1.6.21)
    hike (1.2.3)
    hipchat (1.5.2)
@@ -355,7 +379,7 @@ GEM
    http-cookie (1.0.2)
      domain_name (~> 0.5)
    http_parser.rb (0.5.3)
-    httparty (0.13.5)
+    httparty (0.13.7)
      json (~> 1.8)
      multi_xml (>= 0.5.2)
    httpclient (2.7.0.1)
@@ -365,7 +389,7 @@ GEM
    inflecto (0.0.2)
    ipaddress (0.8.0)
    jquery-atwho-rails (1.3.2)
-    jquery-rails (3.1.3)
+    jquery-rails (3.1.4)
      railties (>= 3.0, < 5.0)
      thor (>= 0.14, < 2.0)
    jquery-scrollto-rails (1.4.3)
@@ -376,19 +400,21 @@ GEM
    jquery-ui-rails (4.2.1)
      railties (>= 3.2.16)
    json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.2)
    kaminari (0.16.3)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
-    kgio (2.9.3)
+    kgio (2.10.0)
    launchy (2.4.3)
      addressable (~> 2.3)
    letter_opener (1.1.2)
      launchy (~> 2.2)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
+    listen (2.9.0)
+      celluloid (>= 0.15.2)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
    macaddr (1.7.1)
      systemu (~> 2.6.2)
    mail (2.6.3)
@@ -405,16 +431,14 @@ GEM
    multipart-post (2.0.0)
    mysql2 (0.3.20)
    nested_form (0.3.2)
-    net-ldap (0.11)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    netrc (0.10.3)
+    net-ldap (0.12.1)
+    net-ssh (3.0.1)
+    netrc (0.11.0)
    newrelic-grape (2.0.0)
      grape
      newrelic_rpm
    newrelic_rpm (3.9.4.245)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
      mini_portile (~> 0.6.0)
    nprogress-rails (0.1.6.7)
    oauth (0.4.7)
@@ -438,12 +462,15 @@ GEM
    omniauth-github (1.1.2)
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.1)
-    omniauth-gitlab (1.0.0)
+    omniauth-gitlab (1.0.1)
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.2.6)
-      omniauth (> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-google-oauth2 (0.2.10)
+      addressable (~> 2.3)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (~> 1.3.1)
    omniauth-kerberos (0.3.0)
      omniauth-multipassword
      timfel-krb5-auth (~> 0.8)
@@ -467,18 +494,18 @@ GEM
      activesupport
      nokogiri (>= 1.4.4)
      omniauth (~> 1.0)
-    opennebula (4.12.1)
+    opennebula (4.14.2)
      json
      nokogiri
      rbvmomi
    org-ruby (0.9.12)
      rubypants (~> 0.2)
    orm_adapter (0.5.0)
-    paranoia (2.1.3)
+    paranoia (2.1.4)
      activerecord (~> 4.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
      ast (>= 1.1, < 3.0)
-    pg (0.18.2)
+    pg (0.18.4)
    poltergeist (1.6.0)
      capybara (~> 2.1)
      cliver (~> 0.3.1)
@@ -486,7 +513,7 @@ GEM
      websocket-driver (>= 0.2.0)
    posix-spawn (0.3.11)
    powerpack (0.0.9)
-    pry (0.10.1)
+    pry (0.10.3)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
@@ -495,7 +522,7 @@ GEM
    pyu-ruby-sasl (0.0.3.3)
    quiet_assets (1.0.3)
      railties (>= 3.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.4)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (4.3.0)
@@ -513,28 +540,37 @@ GEM
      rack
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.1.14)
-      actionmailer (= 4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      activemodel (= 4.1.14)
-      activerecord (= 4.1.14)
-      activesupport (= 4.1.14)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
    rails-observers (0.1.2)
      activemodel (~> 4.0)
-    railties (4.1.14)
-      actionpack (= 4.1.14)
-      activesupport (= 4.1.14)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.0.0)
    raindrops (0.15.0)
    rake (10.4.2)
    raphael-rails (2.1.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
    rb-inotify (0.9.5)
      ffi (>= 0.5.0)
    rblineprof (0.3.6)
@@ -546,13 +582,13 @@ GEM
    rdoc (3.12.2)
      json (~> 1.4)
    redcarpet (3.3.3)
-    redis (3.2.1)
-    redis-actionpack (4.0.0)
+    redis (3.2.2)
+    redis-actionpack (4.0.1)
      actionpack (~> 4)
      redis-rack (~> 1.5.0)
      redis-store (~> 1.1.0)
-    redis-activesupport (4.1.1)
-      activesupport (~> 4)
+    redis-activesupport (4.1.5)
+      activesupport (>= 3, < 5)
      redis-store (~> 1.1.0)
    redis-namespace (1.5.2)
      redis (~> 3.0, >= 3.0.4)
@@ -563,20 +599,20 @@ GEM
      redis-actionpack (~> 4)
      redis-activesupport (~> 4)
      redis-store (~> 1.1.0)
-    redis-store (1.1.6)
+    redis-store (1.1.7)
      redis (>= 2.2)
-    request_store (1.2.0)
+    request_store (1.2.1)
    rerun (0.10.0)
      listen (~> 2.7, >= 2.7.3)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
    rest-client (1.8.0)
      http-cookie (>= 1.0.2, < 2.0)
      mime-types (>= 1.16, < 3.0)
      netrc (~> 0.7)
    rinku (1.7.3)
    rotp (2.1.1)
-    rouge (1.10.1)
+    rouge (1.7.7)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)
@@ -716,14 +752,14 @@ GEM
    terminal-table (1.5.2)
    test_after_commit (0.2.7)
      activerecord (>= 3.2)
-    thin (1.6.3)
+    thin (1.6.4)
      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
      rack (~> 1.0)
    thor (0.19.1)
    thread_safe (0.3.5)
    tilt (1.4.1)
-    timers (4.0.4)
+    timers (4.1.1)
      hitimes
    timfel-krb5-auth (0.8.3)
    tinder (1.10.1)
@@ -756,9 +792,9 @@ GEM
      kgio (~> 2.6)
      rack
      raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.3)
+    unicorn-worker-killer (0.4.4)
      get_process_mem (~> 0)
-      unicorn (~> 4)
+      unicorn (>= 4, < 6)
    uniform_notifier (1.9.0)
    uuid (2.3.8)
      macaddr (~> 1.0)
@@ -770,10 +806,15 @@ GEM
      equalizer (~> 0.0, >= 0.0.9)
    warden (1.2.3)
      rack (>= 1.0)
+    web-console (2.2.1)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
    webmock (1.21.0)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.2)
    wikicloth (0.8.1)
@@ -865,6 +906,7 @@ DEPENDENCIES
  mousetrap-rails (~> 1.4.6)
  mysql2 (~> 0.3.16)
  nested_form (~> 0.3.2)
+  net-ssh (~> 3.0.1)
  newrelic-grape
  newrelic_rpm (~> 3.9.4.245)
  nprogress-rails (~> 0.1.6.7)
@@ -890,7 +932,7 @@ DEPENDENCIES
  rack-attack (~> 4.3.0)
  rack-cors (~> 0.4.0)
  rack-oauth2 (~> 1.2.1)
-  rails (= 4.1.14)
+  rails (= 4.2.4)
  raphael-rails (~> 2.1.2)
  rblineprof
  rdoc (~> 3.6)
@@ -898,6 +940,7 @@ DEPENDENCIES
  redis-rails (~> 4.0.0)
  request_store (~> 1.2.0)
  rerun (~> 0.10.0)
+  responders (~> 2.0)
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.3.0)
  rubocop (~> 0.28.0)
@@ -938,6 +981,7 @@ DEPENDENCIES
  unicorn-worker-killer (~> 0.4.2)
  version_sorter (~> 2.0.0)
  virtus (~> 1.0.1)
+  web-console (~> 2.0)
  webmock (~> 1.21.0)
  wikicloth (= 0.8.1)


--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -17,9 +17,8 @@ class SentNotification < ActiveRecord::Base
  belongs_to :noteable, polymorphic: true
  belongs_to :recipient, class_name: "User"

-  validate :project, :recipient, :reply_key, presence: true
-  validate :reply_key, uniqueness: true
-
+  validates :project, :recipient, :reply_key, presence: true
+  validates :reply_key, uniqueness: true
  validates :noteable_id, presence: true, unless: :for_commit?
  validates :commit_id, presence: true, if: :for_commit?
  validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true

--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -53,7 +53,7 @@ class EmailsOnPushWorker
          reverse_compare:            reverse_compare,
          send_from_committer_email:  send_from_committer_email,
          disable_diffs:              disable_diffs
-        ).deliver
+        ).deliver_now
      # These are input errors and won't be corrected even if Sidekiq retries
      rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e
        logger.info("Failed to send e-mail for project '#{project.name_with_namespace}' to #{recipient}: #{e}")

--- a/bin/ci/upgrade.rb
+++ b/bin/ci/upgrade.rb
--- a/bin/rails
+++ b/bin/rails
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
--- a/bin/rake
+++ b/bin/rake
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-require 'bundler/setup'
-load Gem.bin_path('rake', 'rake')
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
--- a/bin/setup
+++ b/bin/setup
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
--- a/bin/upgrade.rb
+++ b/bin/upgrade.rb
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)

 # Initialize the rails application
-Gitlab::Application.initialize!
+Rails.application.initialize!
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
-Gitlab::Application.configure do
+Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb

  # In the development environment your application's code is reloaded on

--- a/config/environments/production.rb
+++ b/config/environments/production.rb
-Gitlab::Application.configure do
+Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb

  # Code is not reloaded between requests

--- a/config/environments/test.rb
+++ b/config/environments/test.rb
-Gitlab::Application.configure do
+Rails.application.configure do
  # Settings specified here will take precedence over those in config/application.rb

  # The test environment is used exclusively to run your application's

--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
 # Be sure to restart your server when you modify this file.

-Gitlab::Application.config.action_dispatch.cookies_serializer = :hybrid
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid
--- a/config/initializers/default_url_options.rb
+++ b/config/initializers/default_url_options.rb
@@ -8,4 +8,4 @@ unless Gitlab.config.gitlab_on_standard_port?
  default_url_options[:port] = Gitlab.config.gitlab.port
 end

-Gitlab::Application.routes.default_url_options = default_url_options
+Rails.application.routes.default_url_options = default_url_options
--- a/config/initializers/rack_attack.rb.example
+++ b/config/initializers/rack_attack.rb.example
@@ -4,13 +4,13 @@
 # If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests

 paths_to_be_protected = [
-  "#{Gitlab::Application.config.relative_url_root}/users/password",
-  "#{Gitlab::Application.config.relative_url_root}/users/sign_in",
-  "#{Gitlab::Application.config.relative_url_root}/api/#{API::API.version}/session.json",
-  "#{Gitlab::Application.config.relative_url_root}/api/#{API::API.version}/session",
-  "#{Gitlab::Application.config.relative_url_root}/users",
-  "#{Gitlab::Application.config.relative_url_root}/users/confirmation",
-  "#{Gitlab::Application.config.relative_url_root}/unsubscribes/"
+  "#{Rails.application.config.relative_url_root}/users/password",
+  "#{Rails.application.config.relative_url_root}/users/sign_in",
+  "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json",
+  "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session",
+  "#{Rails.application.config.relative_url_root}/users",
+  "#{Rails.application.config.relative_url_root}/users/confirmation",
+  "#{Rails.application.config.relative_url_root}/unsubscribes/"

 ]


--- a/config/initializers/rack_lineprof.rb
+++ b/config/initializers/rack_lineprof.rb
@@ -2,7 +2,7 @@
 # with darker backgrounds. This patch tweaks the colors a bit so the output is
 # actually readable.
 if Rails.env.development? and RUBY_ENGINE == 'ruby' and ENV['ENABLE_LINEPROF']
-  Gitlab::Application.config.middleware.use(Rack::Lineprof)
+  Rails.application.config.middleware.use(Rack::Lineprof)

  module Rack
    class Lineprof

--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -22,15 +22,15 @@ def find_secure_token
  end
 end

-Gitlab::Application.config.secret_token = find_secure_token
-Gitlab::Application.config.secret_key_base = find_secure_token
+Rails.application.config.secret_token = find_secure_token
+Rails.application.config.secret_key_base = find_secure_token

 # CI
 def generate_new_secure_token
  SecureRandom.hex(64)
 end

-if Gitlab::Application.secrets.db_key_base.blank?
+if Rails.application.secrets.db_key_base.blank?
  warn "Missing `db_key_base` for '#{Rails.env}' environment. The secrets will be generated and stored in `config/secrets.yml`"

  all_secrets = YAML.load_file('config/secrets.yml') if File.exist?('config/secrets.yml')
@@ -46,5 +46,5 @@ if Gitlab::Application.secrets.db_key_base.blank?
    file.write(YAML.dump(all_secrets))
  end

-  Gitlab::Application.secrets.db_key_base = env_secrets['db_key_base']
+  Rails.application.secrets.db_key_base = env_secrets['db_key_base']
 end
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -13,11 +13,11 @@ end
 unless Rails.env.test?
  Gitlab::Application.config.session_store(
    :redis_store, # Using the cookie_store would enable session replay attacks.
-    servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
+    servers: Rails.application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
    key: '_gitlab_session',
    secure: Gitlab.config.gitlab.https,
    httponly: true,
    expire_after: Settings.gitlab['session_expire_delay'] * 60,
-    path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
+    path: (Rails.application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
  )
 end
--- a/config/initializers/sherlock.rb
+++ b/config/initializers/sherlock.rb
 if Gitlab::Sherlock.enabled?
-  Gitlab::Application.configure do |config|
+  Rails.application.configure do |config|
    config.middleware.use(Gitlab::Sherlock::Middleware)
  end
 end
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -8,7 +8,7 @@
 # If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests

 if Rails.env.production?
-  Gitlab::Application.config.action_mailer.delivery_method = :smtp
+  Rails.application.config.action_mailer.delivery_method = :smtp

  ActionMailer::Base.smtp_settings = {
    address: "email.server.com",

--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
-app = Gitlab::Application
+app = Rails.application

 if app.config.serve_static_assets
  # The `ActionDispatch::Static` middleware intercepts requests for static files 

--- a/config/routes.rb
+++ b/config/routes.rb
 require 'sidekiq/web'
 require 'api/api'

-Gitlab::Application.routes.draw do
+Rails.application.routes.draw do
  if Gitlab::Sherlock.enabled?
    namespace :sherlock do
      resources :transactions, only: [:index, :show] do

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -16,7 +16,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"

-  create_table "abuse_reports", force: true do |t|
+  create_table "abuse_reports", force: :cascade do |t|
    t.integer  "reporter_id"
    t.integer  "user_id"
    t.text     "message"
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
    t.datetime "updated_at"
  end

-  create_table "application_settings", force: true do |t|
+  create_table "application_settings", force: :cascade do |t|
    t.integer  "default_projects_limit"
    t.boolean  "signup_enabled"
    t.boolean  "signin_enabled"
@@ -51,7 +51,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
    t.integer  "max_artifacts_size",           default: 100,   null: false
  end

-  create_table "audit_events", force: true do |t|
+  create_table "audit_events", force: :cascade do |t|
    t.integer  "author_id",   null: false
    t.string   "type",        null: false
    t.integer  "entity_id",   null: false
@@ -65,7 +65,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "audit_events", ["entity_id", "entity_type"], name: "index_audit_events_on_entity_id_and_entity_type", using: :btree
  add_index "audit_events", ["type"], name: "index_audit_events_on_type", using: :btree

-  create_table "broadcast_messages", force: true do |t|
+  create_table "broadcast_messages", force: :cascade do |t|
    t.text     "message",    null: false
    t.datetime "starts_at"
    t.datetime "ends_at"
@@ -76,14 +76,14 @@ ActiveRecord::Schema.define(version: 20151118162244) do
    t.string   "font"
  end

-  create_table "ci_application_settings", force: true do |t|
+  create_table "ci_application_settings", force: :cascade do |t|
    t.boolean  "all_broken_builds"
    t.boolean  "add_pusher"
    t.datetime "created_at"
    t.datetime "updated_at"
  end

-  create_table "ci_builds", force: true do |t|
+  create_table "ci_builds", force: :cascade do |t|
    t.integer  "project_id"
    t.string   "status"
    t.datetime "finished_at"
@@ -123,7 +123,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_builds", ["status"], name: "index_ci_builds_on_status", using: :btree
  add_index "ci_builds", ["type"], name: "index_ci_builds_on_type", using: :btree

-  create_table "ci_commits", force: true do |t|
+  create_table "ci_commits", force: :cascade do |t|
    t.integer  "project_id"
    t.string   "ref"
    t.string   "sha"
@@ -144,7 +144,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_commits", ["project_id"], name: "index_ci_commits_on_project_id", using: :btree
  add_index "ci_commits", ["sha"], name: "index_ci_commits_on_sha", using: :btree

-  create_table "ci_events", force: true do |t|
+  create_table "ci_events", force: :cascade do |t|
    t.integer  "project_id"
    t.integer  "user_id"
    t.integer  "is_admin"
@@ -157,7 +157,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_events", ["is_admin"], name: "index_ci_events_on_is_admin", using: :btree
  add_index "ci_events", ["project_id"], name: "index_ci_events_on_project_id", using: :btree

-  create_table "ci_jobs", force: true do |t|
+  create_table "ci_jobs", force: :cascade do |t|
    t.integer  "project_id",                          null: false
    t.text     "commands"
    t.boolean  "active",         default: true,       null: false
@@ -174,7 +174,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_jobs", ["deleted_at"], name: "index_ci_jobs_on_deleted_at", using: :btree
  add_index "ci_jobs", ["project_id"], name: "index_ci_jobs_on_project_id", using: :btree

-  create_table "ci_projects", force: true do |t|
+  create_table "ci_projects", force: :cascade do |t|
    t.string   "name"
    t.integer  "timeout",                  default: 3600,  null: false
    t.datetime "created_at"
@@ -200,7 +200,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_projects", ["gitlab_id"], name: "index_ci_projects_on_gitlab_id", using: :btree
  add_index "ci_projects", ["shared_runners_enabled"], name: "index_ci_projects_on_shared_runners_enabled", using: :btree

-  create_table "ci_runner_projects", force: true do |t|
+  create_table "ci_runner_projects", force: :cascade do |t|
    t.integer  "runner_id",  null: false
    t.integer  "project_id", null: false
    t.datetime "created_at"
@@ -210,7 +210,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_runner_projects", ["project_id"], name: "index_ci_runner_projects_on_project_id", using: :btree
  add_index "ci_runner_projects", ["runner_id"], name: "index_ci_runner_projects_on_runner_id", using: :btree

-  create_table "ci_runners", force: true do |t|
+  create_table "ci_runners", force: :cascade do |t|
    t.string   "token"
    t.datetime "created_at"
    t.datetime "updated_at"
@@ -225,7 +225,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
    t.string   "architecture"
  end

-  create_table "ci_services", force: true do |t|
+  create_table "ci_services", force: :cascade do |t|
    t.string   "type"
    t.string   "title"
    t.integer  "project_id",                 null: false
@@ -237,7 +237,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "ci_services", ["project_id"], name: "index_ci_services_on_project_id", using: :btree

-  create_table "ci_sessions", force: true do |t|
+  create_table "ci_sessions", force: :cascade do |t|
    t.string   "session_id", null: false
    t.text     "data"
    t.datetime "created_at"
@@ -247,7 +247,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_sessions", ["session_id"], name: "index_ci_sessions_on_session_id", using: :btree
  add_index "ci_sessions", ["updated_at"], name: "index_ci_sessions_on_updated_at", using: :btree

-  create_table "ci_taggings", force: true do |t|
+  create_table "ci_taggings", force: :cascade do |t|
    t.integer  "tag_id"
    t.integer  "taggable_id"
    t.string   "taggable_type"
@@ -260,14 +260,14 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "ci_taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "ci_taggings_idx", unique: true, using: :btree
  add_index "ci_taggings", ["taggable_id", "taggable_type", "context"], name: "index_ci_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree

-  create_table "ci_tags", force: true do |t|
+  create_table "ci_tags", force: :cascade do |t|
    t.string  "name"
    t.integer "taggings_count", default: 0
  end

  add_index "ci_tags", ["name"], name: "index_ci_tags_on_name", unique: true, using: :btree

-  create_table "ci_trigger_requests", force: true do |t|
+  create_table "ci_trigger_requests", force: :cascade do |t|
    t.integer  "trigger_id", null: false
    t.text     "variables"
    t.datetime "created_at"
@@ -275,7 +275,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
    t.integer  "commit_id"
  end

-  create_table "ci_triggers", force: true do |t|
+  create_table "ci_triggers", force: :cascade do |t|
    t.string   "token"
    t.integer  "project_id", null: false
    t.datetime "deleted_at"
@@ -285,7 +285,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "ci_triggers", ["deleted_at"], name: "index_ci_triggers_on_deleted_at", using: :btree

-  create_table "ci_variables", force: true do |t|
+  create_table "ci_variables", force: :cascade do |t|
    t.integer "project_id",           null: false
    t.string  "key"
    t.text    "value"
@@ -296,14 +296,14 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "ci_variables", ["project_id"], name: "index_ci_variables_on_project_id", using: :btree

-  create_table "ci_web_hooks", force: true do |t|
+  create_table "ci_web_hooks", force: :cascade do |t|
    t.string   "url",        null: false
    t.integer  "project_id", null: false
    t.datetime "created_at"
    t.datetime "updated_at"
  end

-  create_table "deploy_keys_projects", force: true do |t|
+  create_table "deploy_keys_projects", force: :cascade do |t|
    t.integer  "deploy_key_id", null: false
    t.integer  "project_id",    null: false
    t.datetime "created_at"
@@ -312,7 +312,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "deploy_keys_projects", ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree

-  create_table "emails", force: true do |t|
+  create_table "emails", force: :cascade do |t|
    t.integer  "user_id",    null: false
    t.string   "email",      null: false
    t.datetime "created_at"
@@ -322,7 +322,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "emails", ["email"], name: "index_emails_on_email", unique: true, using: :btree
  add_index "emails", ["user_id"], name: "index_emails_on_user_id", using: :btree

-  create_table "events", force: true do |t|
+  create_table "events", force: :cascade do |t|
    t.string   "target_type"
    t.integer  "target_id"
    t.string   "title"
@@ -341,7 +341,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "events", ["target_id"], name: "index_events_on_target_id", using: :btree
  add_index "events", ["target_type"], name: "index_events_on_target_type", using: :btree

-  create_table "forked_project_links", force: true do |t|
+  create_table "forked_project_links", force: :cascade do |t|
    t.integer  "forked_to_project_id",   null: false
    t.integer  "forked_from_project_id", null: false
    t.datetime "created_at"
@@ -350,7 +350,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree

-  create_table "identities", force: true do |t|
+  create_table "identities", force: :cascade do |t|
    t.string   "extern_uid"
    t.string   "provider"
    t.integer  "user_id"
@@ -361,7 +361,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "identities", ["created_at", "id"], name: "index_identities_on_created_at_and_id", using: :btree
  add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree

-  create_table "issues", force: true do |t|
+  create_table "issues", force: :cascade do |t|
    t.string   "title"
    t.integer  "assignee_id"
    t.integer  "author_id"
@@ -387,7 +387,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "issues", ["state"], name: "index_issues_on_state", using: :btree
  add_index "issues", ["title"], name: "index_issues_on_title", using: :btree

-  create_table "keys", force: true do |t|
+  create_table "keys", force: :cascade do |t|
    t.integer  "user_id"
    t.datetime "created_at"
    t.datetime "updated_at"
@@ -401,7 +401,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "keys", ["created_at", "id"], name: "index_keys_on_created_at_and_id", using: :btree
  add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree

-  create_table "label_links", force: true do |t|
+  create_table "label_links", force: :cascade do |t|
    t.integer  "label_id"
    t.integer  "target_id"
    t.string   "target_type"
@@ -412,7 +412,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "label_links", ["label_id"], name: "index_label_links_on_label_id", using: :btree
  add_index "label_links", ["target_id", "target_type"], name: "index_label_links_on_target_id_and_target_type", using: :btree

-  create_table "labels", force: true do |t|
+  create_table "labels", force: :cascade do |t|
    t.string   "title"
    t.string   "color"
    t.integer  "project_id"
@@ -423,7 +423,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "labels", ["project_id"], name: "index_labels_on_project_id", using: :btree

-  create_table "lfs_objects", force: true do |t|
+  create_table "lfs_objects", force: :cascade do |t|
    t.string   "oid",        null: false
    t.integer  "size",       null: false
    t.datetime "created_at"
@@ -433,7 +433,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "lfs_objects", ["oid"], name: "index_lfs_objects_on_oid", unique: true, using: :btree

-  create_table "lfs_objects_projects", force: true do |t|
+  create_table "lfs_objects_projects", force: :cascade do |t|
    t.integer  "lfs_object_id", null: false
    t.integer  "project_id",    null: false
    t.datetime "created_at"
@@ -442,7 +442,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "lfs_objects_projects", ["project_id"], name: "index_lfs_objects_projects_on_project_id", using: :btree

-  create_table "members", force: true do |t|
+  create_table "members", force: :cascade do |t|
    t.integer  "access_level",       null: false
    t.integer  "source_id",          null: false
    t.string   "source_type",        null: false
@@ -464,7 +464,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "members", ["type"], name: "index_members_on_type", using: :btree
  add_index "members", ["user_id"], name: "index_members_on_user_id", using: :btree

-  create_table "merge_request_diffs", force: true do |t|
+  create_table "merge_request_diffs", force: :cascade do |t|
    t.string   "state"
    t.text     "st_commits"
    t.text     "st_diffs"
@@ -475,7 +475,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree

-  create_table "merge_requests", force: true do |t|
+  create_table "merge_requests", force: :cascade do |t|
    t.string   "target_branch",                 null: false
    t.string   "source_branch",                 null: false
    t.integer  "source_project_id",             null: false
@@ -507,7 +507,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "merge_requests", ["target_project_id", "iid"], name: "index_merge_requests_on_target_project_id_and_iid", unique: true, using: :btree
  add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree

-  create_table "milestones", force: true do |t|
+  create_table "milestones", force: :cascade do |t|
    t.string   "title",       null: false
    t.integer  "project_id",  null: false
    t.text     "description"
@@ -523,7 +523,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "milestones", ["project_id", "iid"], name: "index_milestones_on_project_id_and_iid", unique: true, using: :btree
  add_index "milestones", ["project_id"], name: "index_milestones_on_project_id", using: :btree

-  create_table "namespaces", force: true do |t|
+  create_table "namespaces", force: :cascade do |t|
    t.string   "name",                        null: false
    t.string   "path",                        null: false
    t.integer  "owner_id"
@@ -542,7 +542,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "namespaces", ["public"], name: "index_namespaces_on_public", using: :btree
  add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree

-  create_table "notes", force: true do |t|
+  create_table "notes", force: :cascade do |t|
    t.text     "note"
    t.string   "noteable_type"
    t.integer  "author_id"
@@ -571,7 +571,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "notes", ["project_id"], name: "index_notes_on_project_id", using: :btree
  add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree

-  create_table "oauth_access_grants", force: true do |t|
+  create_table "oauth_access_grants", force: :cascade do |t|
    t.integer  "resource_owner_id", null: false
    t.integer  "application_id",    null: false
    t.string   "token",             null: false
@@ -584,7 +584,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree

-  create_table "oauth_access_tokens", force: true do |t|
+  create_table "oauth_access_tokens", force: :cascade do |t|
    t.integer  "resource_owner_id"
    t.integer  "application_id"
    t.string   "token",             null: false
@@ -599,7 +599,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree

-  create_table "oauth_applications", force: true do |t|
+  create_table "oauth_applications", force: :cascade do |t|
    t.string   "name",                      null: false
    t.string   "uid",                       null: false
    t.string   "secret",                    null: false
@@ -614,12 +614,12 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree

-  create_table "project_import_data", force: true do |t|
+  create_table "project_import_data", force: :cascade do |t|
    t.integer "project_id"
    t.text    "data"
  end

-  create_table "projects", force: true do |t|
+  create_table "projects", force: :cascade do |t|
    t.string   "name"
    t.string   "path"
    t.text     "description"
@@ -656,7 +656,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "projects", ["star_count"], name: "index_projects_on_star_count", using: :btree
  add_index "projects", ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree

-  create_table "protected_branches", force: true do |t|
+  create_table "protected_branches", force: :cascade do |t|
    t.integer  "project_id",                          null: false
    t.string   "name",                                null: false
    t.datetime "created_at"
@@ -666,7 +666,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree

-  create_table "releases", force: true do |t|
+  create_table "releases", force: :cascade do |t|
    t.string   "tag"
    t.text     "description"
    t.integer  "project_id"
@@ -677,7 +677,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "releases", ["project_id", "tag"], name: "index_releases_on_project_id_and_tag", using: :btree
  add_index "releases", ["project_id"], name: "index_releases_on_project_id", using: :btree

-  create_table "sent_notifications", force: true do |t|
+  create_table "sent_notifications", force: :cascade do |t|
    t.integer "project_id"
    t.integer "noteable_id"
    t.string  "noteable_type"
@@ -689,7 +689,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree

-  create_table "services", force: true do |t|
+  create_table "services", force: :cascade do |t|
    t.string   "type"
    t.string   "title"
    t.integer  "project_id"
@@ -709,7 +709,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "services", ["project_id"], name: "index_services_on_project_id", using: :btree
  add_index "services", ["template"], name: "index_services_on_template", using: :btree

-  create_table "snippets", force: true do |t|
+  create_table "snippets", force: :cascade do |t|
    t.string   "title"
    t.text     "content"
    t.integer  "author_id",                    null: false
@@ -729,7 +729,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "snippets", ["project_id"], name: "index_snippets_on_project_id", using: :btree
  add_index "snippets", ["visibility_level"], name: "index_snippets_on_visibility_level", using: :btree

-  create_table "subscriptions", force: true do |t|
+  create_table "subscriptions", force: :cascade do |t|
    t.integer  "user_id"
    t.integer  "subscribable_id"
    t.string   "subscribable_type"
@@ -740,7 +740,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do

  add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id"], name: "subscriptions_user_id_and_ref_fields", unique: true, using: :btree

-  create_table "taggings", force: true do |t|
+  create_table "taggings", force: :cascade do |t|
    t.integer  "tag_id"
    t.integer  "taggable_id"
    t.string   "taggable_type"
@@ -753,14 +753,14 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true, using: :btree
  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree

-  create_table "tags", force: true do |t|
+  create_table "tags", force: :cascade do |t|
    t.string  "name"
    t.integer "taggings_count", default: 0
  end

  add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree

-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
    t.string   "email",                      default: "",    null: false
    t.string   "encrypted_password",         default: "",    null: false
    t.string   "reset_password_token"
@@ -826,7 +826,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
  add_index "users", ["username"], name: "index_users_on_username", using: :btree

-  create_table "users_star_projects", force: true do |t|
+  create_table "users_star_projects", force: :cascade do |t|
    t.integer  "project_id", null: false
    t.integer  "user_id",    null: false
    t.datetime "created_at"
@@ -837,7 +837,7 @@ ActiveRecord::Schema.define(version: 20151118162244) do
  add_index "users_star_projects", ["user_id", "project_id"], name: "index_users_star_projects_on_user_id_and_project_id", unique: true, using: :btree
  add_index "users_star_projects", ["user_id"], name: "index_users_star_projects_on_user_id", using: :btree

-  create_table "web_hooks", force: true do |t|
+  create_table "web_hooks", force: :cascade do |t|
    t.string   "url"
    t.integer  "project_id"
    t.datetime "created_at"