Merge branch 'release/0.5.patch.1'

* release/0.5.patch.1: #FIX rmagick gem
ulmic · Dec 8, 2015 · 65c72d7 · 65c72d7
2 parents 98c859a + 997314c
commit 65c72d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,7 +25,7 @@ gem 'russian'
 gem 'russian_sex'
 gem 'carrierwave'
 gem 'mini_magick'
-gem 'rmagick'
+gem 'rmagick', '2.15.3'
 #gem 'datetimepicker-rails', github: 'zpaulovics/datetimepicker-rails', submodules: true
 gem 'js-routes'
 gem 'i18n-js', git: 'https://github.com/fnando/i18n-js'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -415,7 +415,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rmagick (2.15.4)
+    rmagick (2.15.3)
     ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
     russia_regions (0.0.3)
@@ -569,7 +569,7 @@ DEPENDENCIES
   railroady
   rails (= 4.2.1)
   react-rails (~> 1.3.0)
-  rmagick
+  rmagick (= 2.15.3)
   russia_regions
   russian
   russian_sex