diff --git a/Gemfile b/Gemfile
index b9e77dd3009..f683a3d3915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,9 @@ gem 'bcrypt', '~> 3.1.7', require: false
 # it being automatically loaded by sprockets
 gem 'uglifier', '>= 1.3.0', require: false
 
+# mime-types 3 only support ruby >= 2
+gem 'mime-types', '< 3', require: false
+
 group :doc do
   gem 'sdoc', '~> 0.4.0'
   gem 'redcarpet', '~> 2.2.2', platforms: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index a0a1772b3cd..d9042b887db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,8 +47,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     arel (5.0.1.20140414130214)
-    bcrypt (3.1.10)
-    benchmark-ips (2.3.0)
+    bcrypt (3.1.11)
+    benchmark-ips (2.6.1)
     builder (3.2.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -57,9 +57,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    dalli (2.7.5)
+    dalli (2.7.6)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     i18n (0.7.0)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
@@ -68,28 +68,31 @@ GEM
     kindlerb (0.1.1)
       mustache
       nokogiri
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
-    mime-types (2.99.1)
-    mini_portile2 (2.0.0)
+    mime-types (2.99.2)
+    mini_portile2 (2.1.0)
     minitest (5.3.3)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     mustache (0.99.8)
     mysql (2.9.1)
-    mysql2 (0.3.20)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    mysql2 (0.3.21)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     pg (0.18.4)
+    pkg-config (1.1.7)
     racc (1.4.14)
     rack (1.5.5)
-    rack-cache (1.5.1)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.5.0)
-    rdoc (4.2.1)
+    rake (11.2.2)
+    rdoc (4.2.2)
+      json (~> 1.4)
     redcarpet (2.2.2)
     ruby-prof (0.11.3)
     sdoc (0.4.1)
@@ -102,16 +105,16 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.11)
-    stackprof (0.2.8)
+    stackprof (0.2.9)
     thor (0.19.1)
     thread_safe (0.3.5)
-    turbolinks (2.5.3)
-      coffee-rails
+    turbolinks (5.0.0)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
     w3c_validators (1.2)
       json
       nokogiri
@@ -130,6 +133,7 @@ DEPENDENCIES
   jquery-rails (~> 3.1.0)
   json
   kindlerb (= 0.1.1)
+  mime-types (< 3)
   minitest (< 5.3.4)
   mocha (~> 0.14)
   mustache (~> 0.99.8)