cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update bundle

Browse source
This commit is contained in:
Tom Hughes 2015-06-08 15:51:14 +01:00
parent ca123fb281
commit 726c149bd5
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Gemfile.lock
View file

@ -43,7 +43,7 @@ GEM
ast (2.0.0) ast (2.0.0)
astrolabe (1.3.0) astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0) parser (>= 2.2.0.pre.3, < 3.0)
autoprefixer-rails (5.1.11) autoprefixer-rails (5.2.0)
execjs execjs
json json
bigdecimal (1.1.0) bigdecimal (1.1.0)
@ -88,7 +88,7 @@ GEM
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
globalid (0.3.5) globalid (0.3.5)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
hashie (3.4.1) hashie (3.4.2)
hike (1.2.3) hike (1.2.3)
htmlentities (4.3.3) htmlentities (4.3.3)
http-cookie (1.0.2) http-cookie (1.0.2)
@ -104,29 +104,30 @@ GEM
execjs (>= 1.4.0) execjs (>= 1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
therubyracer (~> 0.12.1) therubyracer (~> 0.12.1)
json (1.8.2) json (1.8.3)
jsonify (0.3.1) jsonify (0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
jsonify-rails (0.3.2) jsonify-rails (0.3.2)
actionpack actionpack
jsonify (< 0.4.0) jsonify (< 0.4.0)
jwt (1.4.1) jwt (1.5.0)
kgio (2.9.3) kgio (2.9.3)
konacha (3.3.0) konacha (3.5.1)
actionpack (>= 3.1, < 5) actionpack (>= 3.1, < 5)
capybara capybara
colorize colorize
railties (>= 3.1, < 5) railties (>= 3.1, < 5)
sprockets sprockets (>= 2, < 4)
tilt
libv8 (3.16.14.7) libv8 (3.16.14.7)
libxml-ruby (2.8.0) libxml-ruby (2.8.0)
loofah (2.0.1) loofah (2.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
mime-types (2.5) mime-types (2.6.1)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.6.1) minitest (5.7.0)
multi_json (1.11.0) multi_json (1.11.0)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
@ -168,23 +169,23 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
omniauth (>= 1.1.1) omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.1.1) omniauth-oauth2 (>= 1.1.1)
paperclip (4.2.1) paperclip (4.2.2)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
cocaine (~> 0.5.3) cocaine (~> 0.5.3)
mime-types mime-types
parser (2.2.2.2) parser (2.2.2.5)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
pg (0.18.1) pg (0.18.2)
poltergeist (1.6.0) poltergeist (1.6.0)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
powerpack (0.1.0) powerpack (0.1.1)
psych (2.0.13) psych (2.0.13)
r2 (0.2.5) r2 (0.2.5)
rack (1.6.0) rack (1.6.1)
rack-cors (0.4.0) rack-cors (0.4.0)
rack-openid (1.3.1) rack-openid (1.3.1)
rack (>= 1.1.0) rack (>= 1.1.0)
@ -220,16 +221,16 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
rake (10.4.2) rake (10.4.2)
redcarpet (3.2.3) redcarpet (3.3.0)
ref (1.0.5) ref (1.0.5)
rest-client (1.8.0) rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0) http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
rinku (1.7.3) rinku (1.7.3)
rubocop (0.30.1) rubocop (0.32.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.2.1, < 3.0) parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
@ -239,7 +240,7 @@ GEM
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
nokogumbo (= 1.4.1) nokogumbo (= 1.4.1)
sass (3.4.13) sass (3.4.14)
sass-rails (5.0.3) sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.1) sass (~> 3.1)
@ -257,7 +258,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4) sprockets-rails (2.3.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
@ -269,8 +270,8 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.7.3) timecop (0.7.4)
tins (1.5.1) tins (1.5.2)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.7.1) uglifier (2.7.1)