zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2015-04-22 16:50:29 +00:00
commit bded4ad064
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -26,6 +26,7 @@ gem 'thread'
gem 'scrypt' gem 'scrypt'
gem 'rack-cache' gem 'rack-cache'
gem 'rest-client' gem 'rest-client'
gem 'geoip'
platform :mri, :rbx do platform :mri, :rbx do
gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic

2
Gemfile.lock
View file

@ -62,6 +62,7 @@ GEM
ffi (>= 1.0.0) ffi (>= 1.0.0)
rake rake
filesize (0.0.3) filesize (0.0.3)
geoip (1.5.0)
google-api-client (0.7.1) google-api-client (0.7.1)
addressable (>= 2.3.2) addressable (>= 2.3.2)
autoparse (>= 0.3.3) autoparse (>= 0.3.3)
@ -242,6 +243,7 @@ DEPENDENCIES
fabrication fabrication
faker faker
filesize filesize
geoip
google-api-client google-api-client
hiredis hiredis
jdbc-postgres jdbc-postgres

2
views/plan/_pricing.erb
View file

@ -134,7 +134,7 @@
<strong>It's safe.</strong> We use <a href="https://stripe.com" target="_blank">Stripe</a> for payments, and never store your credit card information directly. <strong>It's safe.</strong> We use <a href="https://stripe.com" target="_blank">Stripe</a> for payments, and never store your credit card information directly.
</li> </li>
<li> <li>
<strong>It's affordable, only <strong>$<%= Site::PLAN_FEATURES[:supporter][:price] %> per month</strong>. <strong>It's affordable.</strong> Only $<%= Site::PLAN_FEATURES[:supporter][:price] %> per month.
</li> </li>
<li> <li>
<strong>You can cancel or change plans anytime.</strong> If you do, we'll refund or credit the amount you didn't use. <strong>You can cancel or change plans anytime.</strong> If you do, we'll refund or credit the amount you didn't use.