Merge branch 'master' into update-mailroom

1 files changed, 275 insertions, 236 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 6a82d99a14f..b033f6fab63 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,31 +4,36 @@ GEM
     CFPropertyList (2.3.1)
     RedCloth (4.2.9)
     ace-rails-ap (2.0.1)
-    actionmailer (4.1.11)
-      actionpack (= 4.1.11)
-      actionview (= 4.1.11)
+    actionmailer (4.1.12)
+      actionpack (= 4.1.12)
+      actionview (= 4.1.12)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.11)
-      actionview (= 4.1.11)
-      activesupport (= 4.1.11)
+    actionpack (4.1.12)
+      actionview (= 4.1.12)
+      activesupport (= 4.1.12)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.11)
-      activesupport (= 4.1.11)
+    actionview (4.1.12)
+      activesupport (= 4.1.12)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.11)
-      activesupport (= 4.1.11)
+    activemodel (4.1.12)
+      activesupport (= 4.1.12)
       builder (~> 3.1)
-    activerecord (4.1.11)
-      activemodel (= 4.1.11)
-      activesupport (= 4.1.11)
+    activerecord (4.1.12)
+      activemodel (= 4.1.12)
+      activesupport (= 4.1.12)
       arel (~> 5.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activerecord-session_store (0.1.1)
+      actionpack (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
+      railties (>= 4.0.0, < 5)
     activeresource (4.0.0)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
       rails-observers (~> 0.1.1)
-    activesupport (4.1.11)
+    activesupport (4.1.12)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -37,33 +42,34 @@ GEM
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
     addressable (2.3.8)
-    annotate (2.6.0)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
+    annotate (2.6.10)
+      activerecord (>= 3.2, <= 4.3)
+      rake (~> 10.4)
     arel (5.0.1.20140414130214)
     asana (0.0.6)
       activeresource (>= 3.2.3)
     asciidoctor (1.5.2)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    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.1.11)
+    autoprefixer-rails (5.2.1.2)
       execjs
       json
     awesome_print (1.2.0)
-    axiom-types (0.0.5)
-      descendants_tracker (~> 0.0.1)
-      ice_nine (~> 0.9)
-    bcrypt (3.1.7)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    bcrypt (3.1.10)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.4.1)
+    bootstrap-sass (3.3.5)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.2.19)
     brakeman (3.0.1)
@@ -78,9 +84,7 @@ GEM
       terminal-table (~> 1.4)
     browser (1.0.0)
     builder (3.2.2)
-    byebug (3.2.0)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
+    byebug (6.0.2)
     cal-heatmap-rails (0.0.1)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -88,7 +92,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.9)
+    capybara-screenshot (1.0.11)
       capybara (>= 1.0, < 3)
       launchy
     carrierwave (0.9.0)
@@ -98,6 +102,8 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     charlock_holmes (0.6.9.4)
+    chronic (0.10.2)
+    chunky_png (1.3.4)
     cliver (0.3.2)
     coderay (1.1.0)
     coercible (1.0.0)
@@ -111,8 +117,7 @@ GEM
     coffee-script-source (1.9.1.1)
     colored (1.2)
     colorize (0.5.8)
-    columnize (0.9.0)
-    connection_pool (2.1.0)
+    connection_pool (2.2.0)
     coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -122,15 +127,15 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     creole (0.3.8)
-    d3_rails (3.5.5)
+    d3_rails (3.5.6)
       railties (>= 3.1.0)
-    daemons (1.1.9)
+    daemons (1.2.3)
     database_cleaner (1.4.1)
     debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
-    default_value_for (3.0.0)
+    default_value_for (3.0.1)
       activerecord (>= 3.2.0, < 5.0)
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     devise (3.2.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -139,21 +144,20 @@ GEM
       warden (~> 1.2.3)
     devise-async (0.9.0)
       devise (~> 3.2)
-    devise-two-factor (1.0.1)
+    devise-two-factor (1.0.2)
       activemodel
       activesupport
       attr_encrypted (~> 1.3.2)
-      devise (~> 3.2.4)
-      rails
-      rotp (~> 1.6.1)
+      devise (>= 3.2.4, < 3.5)
+      railties
+      rotp (< 2)
     diff-lcs (1.2.5)
-    diffy (3.0.3)
+    diffy (3.0.7)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (2.1.3)
+    doorkeeper (2.1.4)
       railties (>= 3.2)
-    dotenv (0.9.0)
     dropzonejs-rails (0.7.1)
       rails (> 3.1)
     email_reply_parser (0.5.8)
@@ -163,25 +167,25 @@ GEM
     encryptor (1.3.0)
     enumerize (0.7.0)
       activesupport (>= 3.2)
-    equalizer (0.0.8)
+    equalizer (0.0.11)
     erubis (2.7.0)
     escape_utils (0.2.4)
-    eventmachine (1.0.4)
-    excon (0.45.3)
-    execjs (2.5.2)
+    eventmachine (1.0.8)
+    excon (0.45.4)
+    execjs (2.6.0)
     expression_parser (0.9.0)
     factory_girl (4.3.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.3.0)
       factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    faraday (0.8.9)
+    faraday (0.8.10)
       multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
     fastercsv (1.5.5)
     ffaker (2.0.0)
-    ffi (1.9.8)
+    ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     flowdock (0.7.0)
@@ -202,11 +206,11 @@ GEM
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
       opennebula
-    fog-brightbox (0.7.1)
+    fog-brightbox (0.9.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.30.0)
+    fog-core (1.32.1)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
@@ -216,7 +220,7 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-profitbricks (0.0.3)
+    fog-profitbricks (0.0.5)
       fog-core
       fog-xml
       nokogiri
@@ -227,7 +231,7 @@ GEM
     fog-sakuracloud (1.0.1)
       fog-core
       fog-json
-    fog-softlayer (0.4.6)
+    fog-softlayer (0.4.7)
       fog-core
       fog-json
     fog-terremark (0.1.0)
@@ -242,11 +246,10 @@ GEM
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.2.0.0)
+    font-awesome-rails (4.4.0.0)
       railties (>= 3.2, < 5.0)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
+    foreman (0.78.0)
+      thor (~> 0.19.1)
     formatador (0.2.5)
     fuubar (2.0.0)
       rspec (~> 3.0)
@@ -255,15 +258,14 @@ GEM
       rugged (~> 0.21)
     gemojione (2.0.1)
       json
-    gherkin-ruby (0.3.1)
-      racc
-    github-markup (1.3.1)
-      posix-spawn (~> 0.3.8)
+    get_process_mem (0.2.0)
+    gherkin-ruby (0.3.2)
+    github-markup (1.3.3)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-grit (2.7.2)
+    gitlab-grit (2.7.3)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -285,16 +287,16 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.3)
-    gollum-grit_adapter (0.1.3)
+    gollum-grit_adapter (1.0.0)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.0.2)
-      github-markup (~> 1.3.1)
-      gollum-grit_adapter (~> 0.1, >= 0.1.1)
+    gollum-lib (4.0.3)
+      github-markup (~> 1.3.3)
+      gollum-grit_adapter (~> 1.0)
       nokogiri (~> 1.6.4)
       rouge (~> 1.10.1)
       sanitize (~> 2.1.0)
       stringex (~> 2.5.1)
-    gon (5.0.1)
+    gon (5.0.4)
       actionpack (>= 2.3.0)
       json
     grape (0.6.1)
@@ -307,9 +309,22 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.4.2)
+    grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
+    growl (1.0.3)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.10)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     haml (4.0.7)
       tilt
     haml-rails (0.5.3)
@@ -320,24 +335,23 @@ GEM
     hashie (2.1.2)
     highline (1.6.21)
     hike (1.2.3)
-    hipchat (1.5.0)
+    hipchat (1.5.2)
       httparty
       mimemagic
-    hitimes (1.2.2)
+    hitimes (1.2.3)
     html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_parser.rb (0.5.3)
-    httparty (0.13.3)
+    httparty (0.13.5)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    httpauth (0.2.1)
-    httpclient (2.5.3.3)
+    httpclient (2.6.0.1)
     i18n (0.7.0)
     ice_cube (0.11.1)
-    ice_nine (0.10.0)
+    ice_nine (0.11.1)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     jquery-atwho-rails (1.0.1)
@@ -346,26 +360,26 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-scrollto-rails (1.4.3)
       railties (> 3.1, < 5.0)
-    jquery-turbolinks (2.0.1)
+    jquery-turbolinks (2.0.2)
       railties (>= 3.1.0)
       turbolinks
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.3)
-    jwt (0.1.13)
-      multi_json (>= 1.5)
+    jwt (1.5.1)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.2)
+    kgio (2.9.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
-    listen (2.10.0)
+    listen (2.10.1)
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     mail (2.6.3)
@@ -375,12 +389,14 @@ GEM
     mime-types (1.25.1)
     mimemagic (0.3.0)
     mini_portile (0.6.2)
-    minitest (5.3.5)
+    minitest (5.7.0)
     mousetrap-rails (1.4.6)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    mysql2 (0.3.16)
+    mysql2 (0.3.20)
+    nenv (0.2.0)
+    nested_form (0.3.2)
     net-ldap (0.11)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -389,15 +405,18 @@ GEM
     newrelic_rpm (3.9.4.245)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    notiffany (0.0.7)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     nprogress-rails (0.1.2.3)
     oauth (0.4.7)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    octokit (3.7.0)
+    octokit (3.7.1)
       sawyer (~> 0.6.0, >= 0.5.3)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
@@ -406,30 +425,30 @@ GEM
       multi_json (~> 1.7)
       omniauth (~> 1.1)
       omniauth-oauth (~> 1.0)
-    omniauth-github (1.1.1)
+    omniauth-github (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-gitlab (1.0.0)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.2.5)
+    omniauth-google-oauth2 (0.2.6)
       omniauth (> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-kerberos (0.2.0)
       omniauth-multipassword
       timfel-krb5-auth (~> 0.8)
-    omniauth-multipassword (0.4.1)
+    omniauth-multipassword (0.4.2)
       omniauth (~> 1.0)
-    omniauth-oauth (1.0.1)
+    omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
+    omniauth-oauth2 (1.3.1)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
     omniauth-saml (1.4.1)
       omniauth (~> 1.1)
       ruby-saml (~> 1.0.0)
-    omniauth-shibboleth (1.1.1)
+    omniauth-shibboleth (1.1.2)
       omniauth (>= 1.0.0)
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
@@ -445,7 +464,9 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    parser (2.2.0.2)
+    paranoia (2.1.3)
+      activerecord (~> 4.0)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     pg (0.18.2)
     poltergeist (1.6.0)
@@ -453,60 +474,59 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    posix-spawn (0.3.9)
+    posix-spawn (0.3.11)
     powerpack (0.0.9)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-rails (0.3.2)
+    pry-rails (0.3.4)
       pry (>= 0.9.10)
     pyu-ruby-sasl (0.0.3.3)
-    quiet_assets (1.0.2)
+    quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
-    racc (1.4.12)
     rack (1.5.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.3.0)
       rack
     rack-cors (0.2.9)
-    rack-mini-profiler (0.9.0)
+    rack-mini-profiler (0.9.7)
       rack (>= 1.1.3)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-oauth2 (1.0.8)
+    rack-oauth2 (1.0.10)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.2.0.2)
+      httpclient (>= 2.4)
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rack-protection (1.5.1)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.11)
-      actionmailer (= 4.1.11)
-      actionpack (= 4.1.11)
-      actionview (= 4.1.11)
-      activemodel (= 4.1.11)
-      activerecord (= 4.1.11)
-      activesupport (= 4.1.11)
+    rails (4.1.12)
+      actionmailer (= 4.1.12)
+      actionpack (= 4.1.12)
+      actionview (= 4.1.12)
+      activemodel (= 4.1.12)
+      activerecord (= 4.1.12)
+      activesupport (= 4.1.12)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.11)
+      railties (= 4.1.12)
       sprockets-rails (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.1.11)
-      actionpack (= 4.1.11)
-      activesupport (= 4.1.11)
+    railties (4.1.12)
+      actionpack (= 4.1.12)
+      activesupport (= 4.1.12)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
-    raindrops (0.13.0)
+    raindrops (0.15.0)
     rake (10.4.2)
     raphael-rails (2.1.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rbvmomi (1.8.2)
@@ -521,10 +541,10 @@ GEM
       actionpack (~> 4)
       redis-rack (~> 1.5.0)
       redis-store (~> 1.1.0)
-    redis-activesupport (4.0.0)
+    redis-activesupport (4.1.1)
       activesupport (~> 4)
       redis-store (~> 1.1.0)
-    redis-namespace (1.5.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     redis-rack (1.5.0)
       rack (~> 1.5)
@@ -535,7 +555,7 @@ GEM
       redis-store (~> 1.1.0)
     redis-store (1.1.6)
       redis (>= 2.2)
-    request_store (1.0.5)
+    request_store (1.2.0)
     rerun (0.10.0)
       listen (~> 2.7, >= 2.7.3)
     rest-client (1.8.0)
@@ -545,22 +565,23 @@ GEM
     rinku (1.7.3)
     rotp (1.6.1)
     rouge (1.10.1)
-    rqrcode (0.4.2)
+    rqrcode (0.7.0)
+      chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -577,16 +598,16 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-progressbar (1.7.1)
+    ruby-progressbar (1.7.5)
     ruby-saml (1.0.0)
       nokogiri (>= 1.5.10)
       uuid (~> 2.3)
-    ruby2ruby (2.1.3)
+    ruby2ruby (2.1.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
     ruby_parser (3.5.0)
       sexp_processor (~> 4.1)
-    rubyntlm (0.5.0)
+    rubyntlm (0.5.2)
     rubypants (0.2.0)
     rugged (0.22.2)
     safe_yaml (1.0.4)
@@ -610,9 +631,10 @@ GEM
     select2-rails (3.5.9.3)
       thor (~> 0.14)
     settingslogic (2.0.9)
-    sexp_processor (4.4.5)
+    sexp_processor (4.6.0)
     sham_rack (1.3.6)
       rack
+    shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     sidekiq (3.3.0)
@@ -631,19 +653,20 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.4)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     six (0.2.0)
     slack-notifier (1.0.0)
-    slim (2.0.2)
+    slim (2.0.3)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    spinach (0.8.7)
-      colorize (= 0.5.8)
-      gherkin-ruby (>= 0.3.1)
+    spinach (0.8.10)
+      colorize
+      gherkin-ruby (>= 0.3.2)
+      json
     spinach-rails (0.2.1)
       capybara (>= 2.0.0)
       railties (>= 3)
@@ -674,31 +697,32 @@ GEM
       railties (>= 3.2.5, < 5)
     teaspoon-jasmine (2.2.0)
       teaspoon (>= 1.0.0)
-    temple (0.6.7)
+    temple (0.6.10)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    terminal-table (1.4.5)
-    test_after_commit (0.2.2)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    terminal-table (1.5.2)
+    test_after_commit (0.2.7)
+      activerecord (>= 3.2)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    timers (4.0.1)
+    timers (4.0.4)
       hitimes
     timfel-krb5-auth (0.8.3)
-    tinder (1.9.3)
+    tinder (1.9.4)
       eventmachine (~> 1.0)
-      faraday (~> 0.8)
+      faraday (~> 0.8.9)
       faraday_middleware (~> 0.9)
       hashie (>= 1.0, < 3)
       json (~> 1.8.0)
       mime-types (~> 1.19)
       multi_json (~> 1.7)
       twitter-stream (~> 0.1)
-    tins (1.5.4)
+    tins (1.6.0)
     trollop (2.1.2)
     turbolinks (2.5.3)
       coffee-rails
@@ -708,35 +732,39 @@ GEM
       simple_oauth (~> 0.1.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.3.2)
+    uglifier (2.3.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.4.4)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    unicorn (4.6.3)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.2)
+    unicorn-worker-killer (0.4.3)
+      get_process_mem (~> 0)
       unicorn (~> 4)
     uuid (2.3.8)
       macaddr (~> 1.0)
     version_sorter (2.0.0)
-    virtus (1.0.1)
-      axiom-types (~> 0.0.5)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
       coercible (~> 1.0)
-      descendants_tracker (~> 0.0.1)
-      equalizer (~> 0.0.7)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.3)
       rack (>= 1.0)
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.5.4)
+    websocket-driver (0.6.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
+    whenever (0.8.4)
+      activesupport (>= 2.3.4)
+      chronic (>= 0.6.3)
     wikicloth (0.8.1)
       builder
       expression_parser
@@ -748,146 +776,157 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth
-  ace-rails-ap
+  RedCloth (~> 4.2.9)
+  ace-rails-ap (~> 2.0.1)
+  activerecord-deprecated_finders (~> 1.0.3)
+  activerecord-session_store (~> 0.1.0)
   acts-as-taggable-on (~> 3.4)
-  addressable
-  annotate (~> 2.6.0.beta2)
+  addressable (~> 2.3.8)
+  annotate (~> 2.6.0)
   asana (~> 0.0.6)
   asciidoctor (~> 1.5.2)
-  attr_encrypted (= 1.3.4)
-  awesome_print
-  better_errors
-  binding_of_caller
+  attr_encrypted (~> 1.3.4)
+  awesome_print (~> 1.2.0)
+  better_errors (~> 1.0.1)
+  binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.0)
-  brakeman
+  brakeman (= 3.0.1)
   browser (~> 1.0.0)
   byebug
   cal-heatmap-rails (~> 0.0.1)
   capybara (~> 2.4.0)
   capybara-screenshot (~> 1.0.0)
-  carrierwave
-  charlock_holmes
-  coffee-rails
-  colored
+  carrierwave (~> 0.9.0)
+  charlock_holmes (~> 0.6.9.4)
+  coffee-rails (~> 4.1.0)
+  colored (~> 1.2)
+  colorize (~> 0.5.8)
   coveralls (~> 0.8.2)
   creole (~> 0.3.6)
   d3_rails (~> 3.5.5)
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
-  devise (= 3.2.4)
-  devise-async (= 0.9.0)
-  devise-two-factor
+  devise (~> 3.2.4)
+  devise-async (~> 0.9.0)
+  devise-two-factor (~> 1.0.1)
   diffy (~> 3.0.3)
-  doorkeeper (= 2.1.3)
-  dropzonejs-rails
-  email_reply_parser
+  doorkeeper (~> 2.1.3)
+  dropzonejs-rails (~> 0.7.1)
+  email_reply_parser (~> 0.5.8)
   email_spec (~> 1.6.0)
-  enumerize
-  factory_girl_rails
+  enumerize (~> 0.7.0)
+  factory_girl_rails (~> 4.3.0)
   ffaker (~> 2.0.0)
   fog (~> 1.25.0)
   font-awesome-rails (~> 4.2)
   foreman
   fuubar (~> 2.0.0)
   gemnasium-gitlab-service (~> 0.2)
-  github-markup
+  github-markup (~> 1.3.1)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-linguist (~> 3.0.1)
   gitlab_emoji (~> 0.1)
   gitlab_git (~> 7.2.15)
   gitlab_meta (= 7.0)
-  gitlab_omniauth-ldap (= 1.2.1)
+  gitlab_omniauth-ldap (~> 1.2.1)
   gollum-lib (~> 4.0.2)
   gon (~> 5.0.0)
   grape (~> 0.6.1)
   grape-entity (~> 0.4.2)
-  haml-rails
+  growl
+  guard-rspec (~> 4.2.0)
+  haml-rails (~> 0.5.3)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
-  httparty
+  httparty (~> 0.13.3)
   jquery-atwho-rails (~> 1.0.0)
-  jquery-rails (= 3.1.3)
-  jquery-scrollto-rails
-  jquery-turbolinks
-  jquery-ui-rails
+  jquery-rails (~> 3.1.3)
+  jquery-scrollto-rails (~> 1.4.3)
+  jquery-turbolinks (~> 2.0.1)
+  jquery-ui-rails (~> 4.2.1)
   kaminari (~> 0.15.1)
-  letter_opener
+  letter_opener (~> 1.1.2)
   mail_room (~> 0.5.1)
-  minitest (~> 5.3.0)
-  mousetrap-rails
-  mysql2
-  newrelic_rpm
-  nprogress-rails
-  octokit (= 3.7.0)
+  minitest (~> 5.7.0)
+  mousetrap-rails (~> 1.4.6)
+  mysql2 (~> 0.3.16)
+  nested_form (~> 0.3.2)
+  newrelic_rpm (~> 3.9.4.245)
+  nprogress-rails (~> 0.1.2.3)
+  oauth2 (~> 1.0.0)
+  octokit (~> 3.7.0)
   omniauth (~> 1.2.2)
-  omniauth-bitbucket
-  omniauth-github
-  omniauth-gitlab
-  omniauth-google-oauth2
-  omniauth-kerberos
+  omniauth-bitbucket (~> 0.0.2)
+  omniauth-github (~> 1.1.1)
+  omniauth-gitlab (~> 1.0.0)
+  omniauth-google-oauth2 (~> 0.2.5)
+  omniauth-kerberos (~> 0.2.0)
   omniauth-saml (~> 1.4.0)
-  omniauth-shibboleth
-  omniauth-twitter
+  omniauth-shibboleth (~> 1.1.1)
+  omniauth-twitter (~> 1.0.1)
   omniauth_crowd
-  org-ruby (= 0.9.12)
-  pg
+  org-ruby (~> 0.9.12)
+  paranoia (~> 2.0)
+  pg (~> 0.18.2)
   poltergeist (~> 1.6.0)
   pry-rails
-  quiet_assets (~> 1.0.1)
+  quiet_assets (~> 1.0.2)
   rack-attack (~> 4.3.0)
-  rack-cors
-  rack-mini-profiler
+  rack-cors (~> 0.2.9)
+  rack-mini-profiler (~> 0.9.0)
   rack-oauth2 (~> 1.0.5)
-  rails (= 4.1.11)
+  rails (= 4.1.12)
   raphael-rails (~> 2.1.2)
+  rb-fsevent
+  rb-inotify
   rdoc (~> 3.6)
   redcarpet (~> 3.3.2)
-  redis-rails
-  request_store
+  redis-rails (~> 4.0.0)
+  request_store (~> 1.2.0)
   rerun (~> 0.10.0)
-  rqrcode-rails3
+  rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.3.0)
   rubocop (= 0.28.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
   sass-rails (~> 4.0.5)
-  sdoc
-  seed-fu
+  sdoc (~> 0.3.20)
+  seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
-  settingslogic
+  settingslogic (~> 2.0.9)
   sham_rack
   shoulda-matchers (~> 2.8.0)
-  sidekiq (~> 3.3)
-  sidetiq (= 0.6.3)
-  simplecov
-  sinatra
-  six
+  sidekiq (= 3.3.0)
+  sidetiq (~> 0.6.3)
+  simplecov (~> 0.10.0)
+  sinatra (~> 1.4.4)
+  six (~> 0.2.0)
   slack-notifier (~> 1.0.0)
-  slim
-  spinach-rails
-  spring (~> 1.3.1)
-  spring-commands-rspec (~> 1.0.0)
+  slim (~> 2.0.2)
+  spinach-rails (~> 0.2.1)
+  spring (~> 1.3.6)
+  spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.0.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 2.12.3)
-  stamp
-  state_machine
-  task_list (= 1.0.2)
+  stamp (~> 0.5.0)
+  state_machine (~> 1.2.0)
+  task_list (~> 1.0.2)
   teaspoon (~> 1.0.0)
-  teaspoon-jasmine
-  test_after_commit
-  thin
+  teaspoon-jasmine (~> 2.2.0)
+  test_after_commit (~> 0.2.2)
+  thin (~> 1.6.1)
   tinder (~> 1.9.2)
   turbolinks (~> 2.5.0)
-  uglifier
+  uglifier (~> 2.3.2)
   underscore-rails (~> 1.4.4)
-  unf
-  unicorn (~> 4.6.3)
-  unicorn-worker-killer
-  version_sorter
-  virtus
+  unf (~> 0.1.4)
+  unicorn (~> 4.8.2)
+  unicorn-worker-killer (~> 0.4.2)
+  version_sorter (~> 2.0.0)
+  virtus (~> 1.0.1)
   webmock (~> 1.21.0)
+  whenever (~> 0.8.4)
   wikicloth (= 0.8.1)
 
 BUNDLED WITH