zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-28 11:12:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:kyledrake/neocities-web

Browse source
This commit is contained in:
Kyle Drake 2014-03-27 20:34:12 -07:00
commit 1c5a9f50ee
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -4,7 +4,7 @@ gem 'sinatra'
gem 'redis' gem 'redis'
gem 'sequel' gem 'sequel'
gem 'slim' gem 'slim'
gem 'bcrypt-ruby', require: 'bcrypt' gem 'bcrypt'
gem 'sinatra-flash', require: 'sinatra/flash' gem 'sinatra-flash', require: 'sinatra/flash'
gem 'sinatra-xsendfile', require: 'sinatra/xsendfile' gem 'sinatra-xsendfile', require: 'sinatra/xsendfile'
gem 'puma', require: nil gem 'puma', require: nil

4
Gemfile.lock
View file

@ -5,8 +5,6 @@ GEM
ago (0.1.5) ago (0.1.5)
ansi (1.4.3) ansi (1.4.3)
bcrypt (3.1.7) bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
builder (3.2.2) builder (3.2.2)
celluloid (0.15.2) celluloid (0.15.2)
timers (~> 1.1.0) timers (~> 1.1.0)
@ -137,7 +135,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
ago ago
bcrypt-ruby bcrypt
fabrication fabrication
faker faker
hiredis hiredis