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-04-14 09:22:44 +01:00
parent 080b12330b
commit 52d7cae438
2 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -3,6 +3,9 @@ source "https://rubygems.org"
# Require rails
gem "rails", "4.2.1"
# Sprockets 3 seems to be buggy, so stick with 2 for now
gem "sprockets", "~> 2.12.3"
# Require things which have moved to gems in ruby 1.9
gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19

39
Gemfile.lock
View file

@ -43,7 +43,7 @@ GEM
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
autoprefixer-rails (5.1.7.1)
autoprefixer-rails (5.1.9)
execjs
json
bigdecimal (1.1.0)
@ -62,14 +62,14 @@ GEM
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1)
coffee-script-source (1.9.1.1)
colorize (0.7.5)
composite_primary_keys (8.1.0)
activerecord (~> 4.2.0)
coveralls (0.7.11)
coveralls (0.8.0)
multi_json (~> 1.10)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.9.1)
@ -79,16 +79,20 @@ GEM
dalli (2.7.4)
deadlock_retry (1.2.0)
docile (1.1.5)
domain_name (0.5.23)
unf (>= 0.0.5, < 1.0.0)
dynamic_form (1.1.4)
erubis (2.7.0)
execjs (2.4.0)
execjs (2.5.2)
faraday (0.9.1)
multipart-post (>= 1.2, < 3)
globalid (0.3.3)
globalid (0.3.5)
activesupport (>= 4.1.0)
hashie (3.4.0)
hashie (3.4.1)
hike (1.2.3)
htmlentities (4.3.3)
http-cookie (1.0.2)
domain_name (~> 0.5)
http_accept_language (2.0.5)
httpclient (2.6.0.1)
i18n (0.7.0)
@ -122,7 +126,7 @@ GEM
mime-types (>= 1.16, < 3)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.5.1)
minitest (5.6.0)
multi_json (1.11.0)
multi_xml (0.5.5)
multipart-post (2.0.0)
@ -203,26 +207,27 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.4.2)
redcarpet (3.2.2)
redcarpet (3.2.3)
ref (1.0.5)
rest-client (1.7.3)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rinku (1.7.3)
rubocop (0.29.1)
rubocop (0.30.0)
astrolabe (~> 1.3)
parser (>= 2.2.0.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-openid (2.7.0)
ruby-progressbar (1.7.1)
ruby-progressbar (1.7.5)
sanitize (3.1.2)
crass (~> 1.0.1)
nokogiri (>= 1.4.4)
nokogumbo (= 1.2.0)
sass (3.4.13)
sass-rails (5.0.1)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
@ -245,7 +250,7 @@ GEM
sprockets (>= 2.8, < 4.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
therubyracer (0.12.1)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
@ -258,10 +263,13 @@ GEM
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.6)
validates_email_format_of (1.6.2)
i18n
vendorer (0.1.16)
websocket-driver (0.5.3)
websocket-driver (0.5.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.0.0)
@ -311,6 +319,7 @@ DEPENDENCIES
sanitize
sass-rails (~> 5.0)
soap4r-ruby1.9
sprockets (~> 2.12.3)
timecop
uglifier (>= 1.3.0)
validates_email_format_of (>= 1.5.1)