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 2016-04-11 17:57:56 -07:00
commit c4ec5fe00e
2 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -68,6 +68,7 @@ end
group :development do group :development do
gem 'shotgun', require: nil gem 'shotgun', require: nil
gem 'certified'
end end
group :test do group :test do

44
Gemfile.lock
View file

@ -1,7 +1,7 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (4.2.5.1) activesupport (4.2.6)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -9,16 +9,15 @@ GEM
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.4.0) addressable (2.4.0)
ago (0.1.5) ago (0.1.5)
hoe (>= 1.12.2)
annoy (0.5.6) annoy (0.5.6)
highline (>= 1.5.0) highline (>= 1.5.0)
ansi (1.5.0) ansi (1.5.0)
base32 (0.3.2) base32 (0.3.2)
bcrypt (3.1.10) bcrypt (3.1.11)
blankslate (3.1.3) blankslate (3.1.3)
builder (3.2.2) builder (3.2.2)
byebug (8.2.2) byebug (8.2.3)
capybara (2.6.2) capybara (2.7.0)
addressable addressable
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
@ -28,15 +27,16 @@ GEM
capybara_minitest_spec (1.0.5) capybara_minitest_spec (1.0.5)
capybara (>= 2) capybara (>= 2)
minitest (>= 4) minitest (>= 4)
certified (1.0.0)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
cliver (0.3.2) cliver (0.3.2)
cocaine (0.5.8) cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0) climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1) coderay (1.1.1)
concurrent-ruby (1.0.0) concurrent-ruby (1.0.1)
connection_pool (2.2.0) connection_pool (2.2.0)
coveralls (0.8.11) coveralls (0.8.13)
json (~> 1.8) json (~> 1.8)
simplecov (~> 0.11.0) simplecov (~> 0.11.0)
term-ansicolor (~> 1.3) term-ansicolor (~> 1.3)
@ -51,11 +51,11 @@ GEM
rack (>= 1.1.0) rack (>= 1.1.0)
uuidtools (~> 2.1.1) uuidtools (~> 2.1.1)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.20160216) domain_name (0.5.20160310)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
drydock (0.6.9) drydock (0.6.9)
erubis (2.7.0) erubis (2.7.0)
fabrication (2.14.1) fabrication (2.15.0)
faker (1.6.3) faker (1.6.3)
i18n (~> 0.5) i18n (~> 0.5)
ffi (1.9.10) ffi (1.9.10)
@ -70,8 +70,6 @@ GEM
hashie (3.4.3) hashie (3.4.3)
highline (1.7.8) highline (1.7.8)
hiredis (0.6.1) hiredis (0.6.1)
hoe (3.14.2)
rake (>= 0.8, < 11.0)
http-cookie (1.0.2) http-cookie (1.0.2)
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.7.0) i18n (0.7.0)
@ -87,8 +85,8 @@ GEM
rake (>= 0.9.2.2) rake (>= 0.9.2.2)
magic (0.2.9) magic (0.2.9)
ffi (>= 0.6.3) ffi (>= 0.6.3)
mail (2.6.3) mail (2.6.4)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 4)
metaclass (0.0.4) metaclass (0.0.4)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.1) mime-types (2.99.1)
@ -104,7 +102,7 @@ GEM
multi_json (1.11.2) multi_json (1.11.2)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (3.0.2) net-ssh (3.1.1)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.6.7.2) nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.0.0.rc2)
@ -125,7 +123,7 @@ GEM
pry-byebug (3.3.0) pry-byebug (3.3.0)
byebug (~> 8.0) byebug (~> 8.0)
pry (~> 0.10) pry (~> 0.10)
puma (2.16.0) puma (3.4.0)
rack (1.6.4) rack (1.6.4)
rack-cache (1.6.1) rack-cache (1.6.1)
rack (>= 0.4) rack (>= 0.4)
@ -138,7 +136,7 @@ GEM
rack_session_access (0.1.1) rack_session_access (0.1.1)
builder (>= 2.0.0) builder (>= 2.0.0)
rack (>= 1.0.0) rack (>= 1.0.0)
rake (10.5.0) rake (11.1.2)
redis (3.2.2) redis (3.2.2)
redis-namespace (1.5.2) redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
@ -160,8 +158,8 @@ 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.21) sass (3.4.22)
scrypt (2.0.2) scrypt (2.1.1)
ffi-compiler (>= 0.0.2) ffi-compiler (>= 0.0.2)
rake rake
sequel (4.8.0) sequel (4.8.0)
@ -170,7 +168,7 @@ GEM
sequel (>= 3.39.0) sequel (>= 3.39.0)
shotgun (0.9.1) shotgun (0.9.1)
rack (>= 1.0) rack (>= 1.0)
sidekiq (4.1.0) sidekiq (4.1.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1) redis (~> 3.2, >= 3.2.1)
@ -207,7 +205,7 @@ GEM
thread (0.2.2) thread (0.2.2)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (2.0.2) tilt (2.0.2)
timecop (0.8.0) timecop (0.8.1)
tins (1.6.0) tins (1.6.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
@ -215,7 +213,7 @@ GEM
unf_ext unf_ext
unf_ext (0.0.7.2) unf_ext (0.0.7.2)
uuidtools (2.1.5) uuidtools (2.1.5)
webmock (1.24.1) webmock (1.24.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
@ -236,6 +234,7 @@ DEPENDENCIES
base32 base32
bcrypt bcrypt
capybara_minitest_spec capybara_minitest_spec
certified
cocaine cocaine
coveralls coveralls
dav4rack dav4rack
@ -294,6 +293,3 @@ DEPENDENCIES
webmock webmock
will_paginate will_paginate
zipruby zipruby
BUNDLED WITH
1.11.2