Dependency conflicts resolved

Gemfile.lock

@@ -173,8 +173,11 @@ GEM
       railties (>= 3.0.0)
     faker (1.9.3)
       i18n (>= 0.7)
-    faraday (0.17.4)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
     fastimage (2.1.4)
     feature (1.4.0)
     ffi (1.10.0)
@@ -498,6 +501,7 @@ GEM
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
+    ruby2_keywords (0.0.4)
     ruby_dep (1.5.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
@@ -521,8 +525,16 @@ GEM
     selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    sentry-raven (2.13.0)
-      faraday (>= 0.7.6, < 1.0)
+    sentry-rails (4.2.2)
+      rails (>= 5.0)
+      sentry-ruby-core (~> 4.2.0)
+    sentry-ruby (4.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      faraday (>= 1.0)
+      sentry-ruby-core (= 4.2.2)
+    sentry-ruby-core (4.2.2)
+      concurrent-ruby
+      faraday
     sexp_processor (4.11.0)
     shellany (0.0.1)
     shoulda-matchers (4.1.2)
@@ -700,7 +712,8 @@ DEPENDENCIES
   ruby-oembed
   sass-rails (>= 4.0.2)
   selectize-rails
-  sentry-raven
+  sentry-rails
+  sentry-ruby
   shoulda-matchers
   skylight
   spring-commands-rspec
@@ -718,8 +731,5 @@ DEPENDENCIES
   webmock
   whenever
 
-RUBY VERSION
-   ruby 2.5.5p157
-
 BUNDLED WITH
    1.17.3