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 @@ -46,7 +46,7 @@ gem 'bootstrap_form', git: 'https://github.com/documentcloud/rails-bo
gem 'stripe', '~> 1.56.2'

gem 'active_model_serializers', '~>0.9.0'
gem 'passenger'
gem 'passenger', '>= 5.3.2'
gem 'descriptive_statistics'
gem 'user_agent_parser'

Expand Down
23 changes: 5 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
GIT
remote: git@github.com:documentcloud/bull_proof_china_shop
revision: 9cd0d29b25feb42e5a501db00ba56e66b99e42e4
branch: master
specs:
bull_proof_china_shop (0.0.1)
country_select (~> 2.2.0)
has_secure_token (~> 1.0.0)
rails (~> 4.2.3)
stripe (~> 1.56.2)

GIT
remote: https://github.com/documentcloud/jammit.git
revision: 5ddcf9c415b2e3985628c35e2ea5bdf94a383284
Expand Down Expand Up @@ -182,8 +171,6 @@ GEM
guard-minitest (2.4.6)
guard-compat (~> 1.2)
minitest (>= 3.0)
has_secure_token (1.0.0)
activerecord (>= 3.0)
hashdiff (0.3.1)
hashie (3.4.6)
highline (1.7.8)
Expand Down Expand Up @@ -259,7 +246,7 @@ GEM
omniauth-oauth (~> 1.1)
options (2.3.2)
os (0.9.6)
passenger (5.0.30)
passenger (6.0.2)
rack
rake (>= 0.8.1)
pdfshaver (0.0.3)
Expand All @@ -277,7 +264,7 @@ GEM
pry (~> 0.9)
slop (~> 3.0)
public_suffix (2.0.4)
rack (1.6.5)
rack (1.6.11)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
Expand Down Expand Up @@ -306,7 +293,7 @@ GEM
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rake (12.3.2)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
Expand Down Expand Up @@ -412,7 +399,7 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 0.2)
omniauth-twitter (~> 1.0)
open_calais!
passenger
passenger (>= 5.3.2)
pdfshaver (>= 0.0.2)
pdftailor
pg
Expand All @@ -436,4 +423,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.14.6
1.17.3