X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/92626671981f706fe3b162a36df293fbce305091..652e94485f21ffbae1fc83acdd4f229c5957b7c1:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index cdaea25f3..8b7976650 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,6 +31,7 @@ GEM multi_json (~> 1.0) arel (3.0.2) bigdecimal (1.1.0) + browser (0.1.3) builder (3.0.0) cocaine (0.2.1) coffee-rails (3.2.2) @@ -40,7 +41,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) - composite_primary_keys (5.0.6) + composite_primary_keys (5.0.4) activerecord (~> 3.2.0) deadlock_retry (1.2.0) dynamic_form (1.1.4) @@ -157,8 +158,9 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) bigdecimal + browser coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.0) + composite_primary_keys (= 5.0.4) deadlock_retry (>= 1.2.0) dynamic_form htmlentities