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 Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# Use Puma as the app server
gem 'puma'
gem 'puma', '>= 4.3.9'
gem 'lingq'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand Down
8 changes: 5 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ GEM
neat (1.7.4)
bourbon (>= 4.0)
sass (>= 3.3)
nio4r (2.5.8)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
normalize-rails (3.0.3)
Expand All @@ -194,7 +195,8 @@ GEM
premailer-rails (1.9.2)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
puma (3.4.0)
puma (5.5.2)
nio4r (~> 2.0)
rabl (0.11.8)
activesupport (>= 2.3.14)
rack (1.6.4)
Expand Down Expand Up @@ -360,7 +362,7 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
lingq
puma
puma (>= 4.3.9)
rails (= 4.2.5)
sinatra (= 1.1.4)
spree (= 3.0.7)
Expand All @@ -372,4 +374,4 @@ DEPENDENCIES
web-console

BUNDLED WITH
1.12.4
1.17.3