Commit 69b44921 authored by Jonne Haß's avatar Jonne Haß Committed by Dennis Schubert
Browse files

bump js-routes

parent 9aa7b2bd

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ gem "handlebars_assets", "0.22.0" 
gem "jquery-rails",      "4.0.5"

gem "jquery-ui-rails",   "5.0.5"

gem "js_image_paths",    "0.0.2"

gem "js-routes",         "1.1.2"

gem "js-routes",         "1.2.0"



source "https://rails-assets.org" do

  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails

Gemfile.lock

+3 −2
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ GEM 
      compass (~> 1.0.0)

      sass-rails (< 5.1)

      sprockets (< 2.13)

    concurrent-ruby (1.0.0)

    configurate (0.3.1)

    connection_pool (2.2.0)

    crack (0.4.3)
@@ -404,7 +405,7 @@ GEM 
      thor (>= 0.14, < 2.0)

    jquery-ui-rails (5.0.5)

      railties (>= 3.2.16)

    js-routes (1.1.2)

    js-routes (1.2.0)

      railties (>= 3.2)

      sprockets-rails

    js_image_paths (0.0.2)
@@ -818,7 +819,7 @@ DEPENDENCIES 
  jasmine-jquery-rails (= 2.0.3)

  jquery-rails (= 4.0.5)

  jquery-ui-rails (= 5.0.5)

  js-routes (= 1.1.2)

  js-routes (= 1.2.0)

  js_image_paths (= 0.0.2)

  jshintrb (= 0.3.0)

  json (= 1.8.3)