X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d35403f1c729c2569452ebaa1a8232bdb5a21a6a..60fd6e2f5b5e2c1d0986ce80f863e83f79293bf7:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 676595a47..130b57b5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,33 +2,33 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.0.2) - actionpack (= 4.0.2) + actionmailer (4.0.3) + actionpack (= 4.0.3) mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) + actionpack (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - activemodel (4.0.2) - activesupport (= 4.0.2) + activemodel (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) + activerecord (4.0.3) + activemodel (= 4.0.3) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) + activesupport (= 4.0.3) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.2) + activesupport (4.0.3) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - arel (4.0.1) + arel (4.0.2) atomic (1.1.14) bigdecimal (1.1.0) builder (3.1.4) @@ -42,7 +42,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.7.0) composite_primary_keys (6.0.1) activerecord (>= 4.0.0) dalli (2.7.0) @@ -54,11 +54,11 @@ GEM multipart-post (>= 1.2, < 3) hike (1.2.3) htmlentities (4.3.1) - http_accept_language (2.0.0) + http_accept_language (2.0.1) httpclient (2.3.4.1) i18n (0.6.9) iconv (0.1) - jquery-rails (3.0.4) + jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -67,9 +67,9 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (0.1.10) + jwt (0.1.11) multi_json (>= 1.5) - kgio (2.8.1) + kgio (2.9.2) libxml-ruby (2.7.0) mail (2.5.4) mime-types (~> 1.16) @@ -98,45 +98,45 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (3.5.2) + paperclip (4.1.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types pg (0.17.1) - polyglot (0.3.3) - psych (2.0.2) + polyglot (0.3.4) + psych (2.0.4) r2 (0.2.2) rack (1.5.2) rack-cors (0.2.9) - rack-openid (1.4.1) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.0.3) + actionmailer (= 4.0.3) + actionpack (= 4.0.3) + activerecord (= 4.0.3) + activesupport (= 4.0.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) + railties (= 4.0.3) sprockets-rails (~> 2.0.0) rails-i18n (4.0.1) i18n (~> 0.6) rails (~> 4.0) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + railties (4.0.3) + actionpack (= 4.0.3) + activesupport (= 4.0.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.1) - redcarpet (3.0.0) + redcarpet (3.1.1) rinku (1.7.3) - ruby-openid (2.3.0) + ruby-openid (2.5.0) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.13) + sass (3.2.14) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) @@ -191,12 +191,12 @@ DEPENDENCIES oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) openstreetmap-i18n-js (>= 3.0.0.rc5.3) - paperclip (~> 3.0) + paperclip (~> 4.0) pg psych r2 rack-cors - rails (= 4.0.2) + rails (= 4.0.3) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2)