Merge pull request #1588 from Georeactor/master

Update gem, fix icons on RTL/Arabic pages

diff --combined Gemfile
index 48658f65d371f1097f440d0dee50e35baa8dc6d3,f9b692353f28996a501db4115751913e8c7676bf..fecc797d092129458c7c0fc0c481ea5d9f678637
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -1,7 -1,7 +1,7 @@@
  source "https://rubygems.org"
  
  # Require rails
 -gem "rails", "5.0.4"
 +gem "rails", "5.0.5"
  
  # Require things which have moved to gems in ruby 1.9
  gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@@ -32,7 -32,7 +32,7 @@@ gem "jquery-rails
  gem "jsonify-rails"
  
  # Use R2 for RTL conversion
- gem "r2"
+ gem "r2", "~> 0.2.7"
  
  # Use autoprefixer to generate CSS prefixes
  gem "autoprefixer-rails"

diff --combined Gemfile.lock
index f73d4a5d8b578ba4ce393d4ff5e8a8a05c3433e5,4c398ccef4ae02feda944a81b816ec77e9649ad4..3cb46643ad21eaabdd80d41647795743f5051e23
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,41 -2,41 +2,41 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
 -    actioncable (5.0.4)
 -      actionpack (= 5.0.4)
 +    actioncable (5.0.5)
 +      actionpack (= 5.0.5)
        nio4r (>= 1.2, < 3.0)
        websocket-driver (~> 0.6.1)
 -    actionmailer (5.0.4)
 -      actionpack (= 5.0.4)
 -      actionview (= 5.0.4)
 -      activejob (= 5.0.4)
 +    actionmailer (5.0.5)
 +      actionpack (= 5.0.5)
 +      actionview (= 5.0.5)
 +      activejob (= 5.0.5)
        mail (~> 2.5, >= 2.5.4)
        rails-dom-testing (~> 2.0)
 -    actionpack (5.0.4)
 -      actionview (= 5.0.4)
 -      activesupport (= 5.0.4)
 +    actionpack (5.0.5)
 +      actionview (= 5.0.5)
 +      activesupport (= 5.0.5)
        rack (~> 2.0)
        rack-test (~> 0.6.3)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.0.2)
      actionpack-page_caching (1.1.0)
        actionpack (>= 4.0.0, < 6)
 -    actionview (5.0.4)
 -      activesupport (= 5.0.4)
 +    actionview (5.0.5)
 +      activesupport (= 5.0.5)
        builder (~> 3.1)
        erubis (~> 2.7.0)
        rails-dom-testing (~> 2.0)
        rails-html-sanitizer (~> 1.0, >= 1.0.3)
 -    activejob (5.0.4)
 -      activesupport (= 5.0.4)
 +    activejob (5.0.5)
 +      activesupport (= 5.0.5)
        globalid (>= 0.3.6)
 -    activemodel (5.0.4)
 -      activesupport (= 5.0.4)
 -    activerecord (5.0.4)
 -      activemodel (= 5.0.4)
 -      activesupport (= 5.0.4)
 +    activemodel (5.0.5)
 +      activesupport (= 5.0.5)
 +    activerecord (5.0.5)
 +      activemodel (= 5.0.5)
 +      activesupport (= 5.0.5)
        arel (~> 7.0)
 -    activesupport (5.0.4)
 +    activesupport (5.0.5)
        concurrent-ruby (~> 1.0, >= 1.0.2)
        i18n (~> 0.7)
        minitest (~> 5.1)
@@@ -45,13 -45,13 +45,13 @@@
        public_suffix (~> 2.0, >= 2.0.2)
      arel (7.1.4)
      ast (2.3.0)
 -    autoprefixer-rails (7.1.1.2)
 +    autoprefixer-rails (7.1.2.3)
        execjs
      bigdecimal (1.1.0)
      builder (3.2.3)
 -    canonical-rails (0.2.0)
 +    canonical-rails (0.2.1)
        rails (>= 4.1, < 5.2)
 -    capybara (2.14.3)
 +    capybara (2.14.4)
        addressable
        mime-types (>= 1.16)
        nokogiri (>= 1.3.3)
@@@ -87,13 -87,13 +87,13 @@@
      dynamic_form (1.1.4)
      erubis (2.7.0)
      execjs (2.7.0)
 -    exifr (1.2.5)
 +    exifr (1.3.1)
      factory_girl (4.8.0)
        activesupport (>= 3.0.0)
      factory_girl_rails (4.8.0)
        factory_girl (~> 4.8.0)
        railties (>= 3.0.0)
 -    faraday (0.12.1)
 +    faraday (0.12.2)
        multipart-post (>= 1.2, < 3)
      ffi (1.9.18)
      fspath (3.1.0)
@@@ -101,20 -101,20 +101,20 @@@
      globalid (0.4.0)
        activesupport (>= 4.2.0)
      hashdiff (0.3.4)
 -    hashie (3.5.5)
 +    hashie (3.5.6)
      htmlentities (4.3.4)
      http_accept_language (2.0.5)
 -    i18n (0.8.4)
 +    i18n (0.8.6)
      i18n-js (3.0.0)
        i18n (~> 0.6, >= 0.6.6)
 -    image_optim (0.24.3)
 +    image_optim (0.25.0)
        exifr (~> 1.2, >= 1.2.2)
        fspath (~> 3.0)
        image_size (~> 1.5)
        in_threads (~> 1.3)
        progress (~> 3.0, >= 3.0.1)
 -    image_optim_rails (0.4.0)
 -      image_optim (~> 0.24.0)
 +    image_optim_rails (0.4.1)
 +      image_optim (~> 0.24)
        rails
        sprockets
      image_size (1.5.0)
@@@ -156,7 -156,7 +156,7 @@@
      mime-types-data (3.2016.0521)
      mimemagic (0.3.0)
      mini_portile2 (2.2.0)
 -    minitest (5.10.2)
 +    minitest (5.10.3)
      multi_json (1.12.1)
      multi_xml (0.6.0)
      multipart-post (2.0.0)
@@@ -185,7 -185,7 +185,7 @@@
      omniauth-github (1.3.0)
        omniauth (~> 1.5)
        omniauth-oauth2 (>= 1.4.0, < 2.0)
 -    omniauth-google-oauth2 (0.5.0)
 +    omniauth-google-oauth2 (0.5.2)
        jwt (~> 1.5)
        multi_json (~> 1.3)
        omniauth (>= 1.1.1)
@@@ -211,7 -211,7 +211,7 @@@
        cocaine (~> 0.5.5)
        mime-types
        mimemagic (= 0.3.0)
 -    parallel (1.11.2)
 +    parallel (1.12.0)
      parser (2.4.0.0)
        ast (~> 2.2)
      pg (0.21.0)
@@@ -225,24 -225,24 +225,24 @@@
      public_suffix (2.0.5)
      r2 (0.2.7)
      rack (2.0.3)
 -    rack-cors (0.4.1)
 +    rack-cors (1.0.1)
      rack-openid (1.3.1)
        rack (>= 1.1.0)
        ruby-openid (>= 2.1.8)
      rack-test (0.6.3)
        rack (>= 1.0)
      rack-uri_sanitizer (0.0.2)
 -    rails (5.0.4)
 -      actioncable (= 5.0.4)
 -      actionmailer (= 5.0.4)
 -      actionpack (= 5.0.4)
 -      actionview (= 5.0.4)
 -      activejob (= 5.0.4)
 -      activemodel (= 5.0.4)
 -      activerecord (= 5.0.4)
 -      activesupport (= 5.0.4)
 -      bundler (>= 1.3.0, < 2.0)
 -      railties (= 5.0.4)
 +    rails (5.0.5)
 +      actioncable (= 5.0.5)
 +      actionmailer (= 5.0.5)
 +      actionpack (= 5.0.5)
 +      actionview (= 5.0.5)
 +      activejob (= 5.0.5)
 +      activemodel (= 5.0.5)
 +      activerecord (= 5.0.5)
 +      activesupport (= 5.0.5)
 +      bundler (>= 1.3.0)
 +      railties (= 5.0.5)
        sprockets-rails (>= 2.0.0)
      rails-controller-testing (1.0.2)
        actionpack (~> 5.x, >= 5.0.1)
@@@ -256,16 -256,16 +256,16 @@@
      rails-i18n (4.0.2)
        i18n (~> 0.6)
        rails (>= 4.0)
 -    railties (5.0.4)
 -      actionpack (= 5.0.4)
 -      activesupport (= 5.0.4)
 +    railties (5.0.5)
 +      actionpack (= 5.0.5)
 +      activesupport (= 5.0.5)
        method_source
        rake (>= 0.8.7)
        thor (>= 0.18.1, < 2.0)
      rainbow (2.2.2)
        rake
      rake (12.0.0)
 -    rb-fsevent (0.9.8)
 +    rb-fsevent (0.10.2)
      rb-inotify (0.9.10)
        ffi (>= 0.5.0, < 2)
      record_tag_helper (1.0.0)
@@@ -290,18 -290,14 +290,18 @@@
        crass (~> 1.0.2)
        nokogiri (>= 1.4.4)
        nokogumbo (~> 1.4.1)
 -    sass (3.4.24)
 +    sass (3.5.1)
 +      sass-listen (~> 4.0.0)
 +    sass-listen (4.0.0)
 +      rb-fsevent (~> 0.9, >= 0.9.4)
 +      rb-inotify (~> 0.9, >= 0.9.7)
      sass-rails (5.0.6)
        railties (>= 4.0.0, < 6)
        sass (~> 3.1)
        sprockets (>= 2.8, < 4.0)
        sprockets-rails (>= 2.0, < 4.0)
        tilt (>= 1.1, < 3)
 -    secure_headers (3.6.5)
 +    secure_headers (3.6.7)
        useragent
      simplecov (0.14.1)
        docile (~> 1.1.0)
@@@ -322,8 -318,8 +322,8 @@@
        ref
      thor (0.19.4)
      thread_safe (0.3.6)
 -    tilt (2.0.7)
 -    tins (1.14.0)
 +    tilt (2.0.8)
 +    tins (1.15.0)
      tzinfo (1.2.3)
        thread_safe (~> 0.1)
      uglifier (3.2.0)
@@@ -386,10 -382,10 +386,10 @@@ DEPENDENCIE
    pg
    poltergeist
    psych
-   r2
+   r2 (~> 0.2.7)
    rack-cors
    rack-uri_sanitizer
 -  rails (= 5.0.4)
 +  rails (= 5.0.5)
    rails-controller-testing
    rails-i18n (~> 4.0.0)
    record_tag_helper