bump markerb

7f27b95d · Jonne Haß · Dennis Schubert · bab07436 · 7f27b95d · 7f27b95d
Commit 7f27b95d authored Sep 07, 2015 by Jonne Haß Committed by Dennis Schubert Sep 19, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -3

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -121,7 +121,7 @@ gem "rails-i18n",           "4.0.4"

 # Mail

-gem "markerb",             "1.0.2"
+gem "markerb",             "1.1.0"
 gem "messagebus_ruby_api", "1.0.3"

 # Parsing

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -421,8 +421,7 @@ GEM
      systemu (~> 2.6.2)
    mail (2.6.3)
      mime-types (>= 1.16, < 3)
-    markerb (1.0.2)
-      redcarpet (>= 2.0)
+    markerb (1.1.0)
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
    messagebus_ruby_api (1.0.3)
@@ -802,7 +801,7 @@ DEPENDENCIES
  json (= 1.8.3)
  json-schema (= 2.5.1)
  logging-rails (= 0.5.0)
-  markerb (= 1.0.2)
+  markerb (= 1.1.0)
  messagebus_ruby_api (= 1.0.3)
  mini_magick (= 4.2.7)
  minitest