Merge d3f9e24 into 539b191

MITLibraries · Aug 4, 2016 · a5acd70 · a5acd70
2 parents 539b191 + d3f9e24
commit a5acd70
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -50,14 +50,14 @@ GEM
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 12.0)
     ansi (1.5.0)
-    arel (7.0.0)
+    arel (7.1.1)
     ast (2.3.0)
-    aws-sdk (2.4.0)
-      aws-sdk-resources (= 2.4.0)
-    aws-sdk-core (2.4.0)
+    aws-sdk (2.5.0)
+      aws-sdk-resources (= 2.5.0)
+    aws-sdk-core (2.5.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.4.0)
-      aws-sdk-core (= 2.4.0)
+    aws-sdk-resources (2.5.0)
+      aws-sdk-core (= 2.5.0)
     bcrypt (3.1.11)
     builder (3.2.2)
     byebug (9.0.5)
@@ -72,12 +72,12 @@ GEM
     cliver (0.3.2)
     commonjs (0.2.7)
     concurrent-ruby (1.0.2)
-    coveralls (0.8.14)
+    coveralls (0.8.15)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     database_cleaner (1.5.3)
@@ -103,7 +103,7 @@ GEM
       thor
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     hashdiff (0.3.0)
     hashie (3.4.4)
@@ -120,7 +120,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.0.1)
+    json (2.0.2)
     jwt (1.5.4)
     less (2.6.0)
       commonjs (~> 0.2.7)
@@ -154,7 +154,7 @@ GEM
       minitest-capybara (~> 0.8)
       minitest-metadata (~> 0.6)
       minitest-rails (~> 3.0)
-    minitest-reporters (1.1.10)
+    minitest-reporters (1.1.11)
       ansi
       builder
       minitest (>= 5.0)
@@ -191,7 +191,7 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    puma (3.5.0)
+    puma (3.6.0)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -238,7 +238,7 @@ GEM
       netrc (~> 0.8)
     rollbar (2.12.0)
       multi_json
-    rubocop (0.41.2)
+    rubocop (0.42.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -255,7 +255,7 @@ GEM
     simplecov-html (0.10.0)
     skylight (0.10.5)
       activesupport (>= 3.0.0)
-    sprockets (3.6.3)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.1.1)
@@ -272,15 +272,15 @@ GEM
     thread_safe (0.3.5)
     tilt (2.0.5)
     timecop (0.8.1)
-    tins (1.6.0)
+    tins (1.11.0)
     twitter-bootstrap-rails (3.2.2)
       actionpack (>= 3.1)
       execjs (>= 2.2.2, >= 2.2)
       less-rails (>= 2.5.0)
       railties (>= 3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.1)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
@@ -303,7 +303,7 @@ GEM
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.9.1)
+    yard (0.9.5)
 
 PLATFORMS
   ruby