Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion puppies/Gemfile
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
gem 'pg'

# Use Puma as the app server
gem 'puma', '~> 3.0'
gem 'puma', '~> 3.12'
gem 'sidekiq'

# Use SCSS for stylesheets
Expand Down
14 changes: 12 additions & 2 deletions puppies/Gemfile.lock
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ GEM
arel (7.1.4)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.3)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
Expand Down Expand Up @@ -83,7 +84,13 @@ GEM
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pg (0.19.0)
puma (3.6.0)
pry (0.11.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
puma (3.12.6)
rack (2.0.1)
rack-protection (1.5.3)
rack
Expand Down Expand Up @@ -146,6 +153,7 @@ GEM
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
redis (~> 3.2, >= 3.2.1)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
Expand Down Expand Up @@ -190,7 +198,9 @@ DEPENDENCIES
jquery-rails
listen (~> 3.0.5)
pg
puma (~> 3.0)
pry
pry-remote
puma (~> 3.12)
rails (~> 5.0.0, >= 5.0.0.1)
redis
redis-rails
Expand Down