X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d0db18da8242956bcb83a1bf53ac79e8e6aabf8d..7f959203802260022b9a45723e1ea931c78e874b:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 6f2e73d43..1ec7948d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,7 +31,6 @@ GEM multi_json (~> 1.0) arel (3.0.2) bigdecimal (1.1.0) - browser (0.1.4) builder (3.0.0) cocaine (0.2.1) coffee-rails (3.2.2) @@ -56,9 +55,11 @@ GEM httpauth (0.1) httpclient (2.2.7) i18n (0.6.0) + i18n-js (3.0.0.rc2) + i18n iconv (0.1) journey (1.0.4) - jquery-rails (2.1.0) + jquery-rails (2.1.1) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) @@ -161,7 +162,6 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) bigdecimal - browser coffee-rails (~> 3.2.1) composite_primary_keys (>= 5.0.8) deadlock_retry (>= 1.2.0) @@ -169,6 +169,7 @@ DEPENDENCIES htmlentities http_accept_language (>= 1.0.2) httpclient + i18n-js (>= 3.0.0.rc2) iconv jquery-rails libxml-ruby (>= 2.0.5)