Pin more gems, fix CSS bugs, and fix many tests
This commit is contained in:
parent
36c25b7b49
commit
f98f34d5fe
|
|
@ -25,8 +25,26 @@ gem 'rails', '= 4.2.8'
|
|||
gem 'protected_attributes'
|
||||
gem 'rails-observers'
|
||||
|
||||
|
||||
# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
|
||||
# This should be the same in ruby/admin/web/websocket-gateway
|
||||
#######
|
||||
gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5. unpin we go above
|
||||
gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
|
||||
gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
|
||||
gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'rubyzip', '1.2.1' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
|
||||
gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
|
||||
gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
|
||||
gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
|
||||
gem 'bcrypt', '3.1.13'
|
||||
#######
|
||||
|
||||
gem 'bootstrap-sass', '2.0.4'
|
||||
gem 'bcrypt-ruby', '3.0.1'
|
||||
|
||||
gem 'sass-rails' #, '~> 3.2.3'
|
||||
gem 'coffee-rails' #, '~> 3.2.1'
|
||||
|
|
@ -58,7 +76,7 @@ gem 'country-select'
|
|||
gem 'aasm' #, '3.0.16'
|
||||
gem 'postgres-copy', '0.6.0'
|
||||
gem 'aws-sdk', '~> 1'
|
||||
gem 'bugsnag'
|
||||
gem 'bugsnag', '5.3.2'
|
||||
gem 'gon'
|
||||
gem 'cocoon'
|
||||
gem 'haml-rails'
|
||||
|
|
@ -77,17 +95,15 @@ gem 'postgres_ext' #, '1.0.0'
|
|||
gem 'resque_mailer'
|
||||
gem 'rest-client'
|
||||
gem 'iso-639'
|
||||
gem 'rubyzip'
|
||||
gem 'sanitize'
|
||||
gem 'slim'
|
||||
#gem 'influxdb', '0.1.8'
|
||||
#gem 'influxdb-rails', '0.1.10'
|
||||
gem 'influxdb-rails'
|
||||
gem 'recurly', '~> 2'
|
||||
gem 'influxdb', '0.3.14'
|
||||
gem 'influxdb-rails', '0.1.12'
|
||||
gem 'sendgrid_toolkit', '>= 1.1.1'
|
||||
gem 'stripe'
|
||||
gem 'zip-codes'
|
||||
gem 'email_validator'
|
||||
gem 'best_in_place' #, github: 'bernat/best_in_place'
|
||||
gem 'auto_strip_attributes', '2.6.0'
|
||||
gem 'elasticsearch'
|
||||
|
|
@ -115,7 +131,7 @@ end
|
|||
#gem 'debugger' # not working with 2.1.2p95
|
||||
|
||||
group :development, :test do
|
||||
gem 'capybara'
|
||||
gem 'capybara', '2.13.0'
|
||||
gem 'rspec-rails' #, '2.14.2'
|
||||
gem 'jasmine', '1.3.1'
|
||||
gem 'execjs', '1.4.0'
|
||||
|
|
|
|||
|
|
@ -19,70 +19,73 @@ GEM
|
|||
remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
|
||||
specs:
|
||||
CFPropertyList (2.3.6)
|
||||
aasm (4.12.3)
|
||||
aasm (5.1.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
actionmailer (4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activejob (= 4.2.10)
|
||||
actionmailer (4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activejob (= 4.2.8)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
actionpack (4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
actionview (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activeadmin (1.2.1)
|
||||
active_material (1.4.2)
|
||||
activeadmin (1.4.3)
|
||||
arbre (>= 1.1.1)
|
||||
coffee-rails
|
||||
formtastic (~> 3.1)
|
||||
formtastic_i18n
|
||||
inherited_resources (~> 1.7)
|
||||
inherited_resources (>= 1.9.0)
|
||||
jquery-rails (>= 4.2.0)
|
||||
kaminari (>= 0.15, < 2.0)
|
||||
railties (>= 4.2, < 5.2)
|
||||
ransack (~> 1.3)
|
||||
kaminari (>= 0.15)
|
||||
railties (>= 4.2, < 5.3)
|
||||
ransack (>= 1.8.7)
|
||||
sass (~> 3.1)
|
||||
sprockets (< 4.1)
|
||||
activeadmin_addons (1.1.2)
|
||||
activeadmin_addons (1.7.1)
|
||||
active_material
|
||||
railties
|
||||
require_all
|
||||
require_all (~> 1.5)
|
||||
sass
|
||||
select2-rails (~> 4.0)
|
||||
xdan-datetimepicker-rails (~> 2.5.1)
|
||||
activejob (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
activejob (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
activemodel (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.10)
|
||||
activemodel (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
activerecord (4.2.8)
|
||||
activemodel (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.10)
|
||||
activesupport (4.2.8)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.5.2)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
amq-client (0.9.12)
|
||||
amq-protocol (>= 1.2.0)
|
||||
eventmachine
|
||||
amq-protocol (2.3.0)
|
||||
amq-protocol (2.3.2)
|
||||
amqp (0.9.8)
|
||||
amq-client (~> 0.9.5)
|
||||
amq-protocol (>= 0.9.4)
|
||||
eventmachine
|
||||
arbre (1.1.1)
|
||||
arbre (1.2.1)
|
||||
activesupport (>= 3.0.0)
|
||||
arel (6.0.4)
|
||||
arr-pm (0.0.10)
|
||||
|
|
@ -94,9 +97,8 @@ GEM
|
|||
aws-sdk-v1 (1.67.0)
|
||||
json (~> 1.4)
|
||||
nokogiri (~> 1)
|
||||
backports (3.11.1)
|
||||
bcrypt (3.1.11)
|
||||
bcrypt-ruby (3.0.1)
|
||||
backports (3.20.2)
|
||||
bcrypt (3.1.13)
|
||||
best_in_place (3.1.1)
|
||||
actionpack (>= 3.2)
|
||||
railties (>= 3.2)
|
||||
|
|
@ -105,9 +107,8 @@ GEM
|
|||
bootstrap-sass (2.0.4.0)
|
||||
bootstrap-will_paginate (0.0.6)
|
||||
will_paginate
|
||||
bugsnag (6.6.3)
|
||||
concurrent-ruby (~> 1.0)
|
||||
builder (3.2.3)
|
||||
bugsnag (5.3.2)
|
||||
builder (3.2.4)
|
||||
cabin (0.9.0)
|
||||
capybara (2.13.0)
|
||||
addressable
|
||||
|
|
@ -122,15 +123,15 @@ GEM
|
|||
json (>= 1.7)
|
||||
mime-types (>= 1.16)
|
||||
mimemagic (>= 0.3.0)
|
||||
carrierwave_direct (0.0.15)
|
||||
carrierwave
|
||||
fog
|
||||
uuidtools
|
||||
childprocess (0.8.0)
|
||||
carrierwave_direct (1.0.0)
|
||||
carrierwave (~> 0.11)
|
||||
fog-aws
|
||||
cause (0.1)
|
||||
childprocess (0.9.0)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
clamp (1.0.1)
|
||||
cocoon (1.2.11)
|
||||
coderay (1.1.2)
|
||||
cocoon (1.2.15)
|
||||
coderay (1.1.3)
|
||||
coffee-rails (4.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0)
|
||||
|
|
@ -138,36 +139,36 @@ GEM
|
|||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
concurrent-ruby (1.0.5)
|
||||
country-select (1.1.1)
|
||||
crass (1.0.3)
|
||||
database_cleaner (1.6.2)
|
||||
debug_inspector (0.0.3)
|
||||
devise (4.4.1)
|
||||
concurrent-ruby (1.1.8)
|
||||
country-select (1.2.1)
|
||||
crass (1.0.6)
|
||||
database_cleaner (1.99.0)
|
||||
debug_inspector (1.0.0)
|
||||
devise (4.7.3)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 5.2)
|
||||
railties (>= 4.1.0)
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
diff-lcs (1.3)
|
||||
domain_name (0.5.20170404)
|
||||
diff-lcs (1.4.4)
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.2.1)
|
||||
elasticsearch (7.5.0)
|
||||
elasticsearch-api (= 7.5.0)
|
||||
elasticsearch-transport (= 7.5.0)
|
||||
elasticsearch-api (7.5.0)
|
||||
dotenv (2.7.6)
|
||||
elasticsearch (7.4.0)
|
||||
elasticsearch-api (= 7.4.0)
|
||||
elasticsearch-transport (= 7.4.0)
|
||||
elasticsearch-api (7.4.0)
|
||||
multi_json
|
||||
elasticsearch-transport (7.5.0)
|
||||
faraday (>= 0.14, < 1)
|
||||
elasticsearch-transport (7.4.0)
|
||||
faraday
|
||||
multi_json
|
||||
email_validator (1.6.0)
|
||||
activemodel
|
||||
erubis (2.7.0)
|
||||
et-orbi (1.0.9)
|
||||
et-orbi (1.2.4)
|
||||
tzinfo
|
||||
eventmachine (1.2.3)
|
||||
excon (0.60.0)
|
||||
excon (0.79.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
factory_girl (4.9.0)
|
||||
|
|
@ -177,9 +178,9 @@ GEM
|
|||
railties (>= 3.0.0)
|
||||
faker (1.3.0)
|
||||
i18n (~> 0.5)
|
||||
faraday (0.14.0)
|
||||
faraday (0.9.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.9.18)
|
||||
ffi (1.12.2)
|
||||
fission (0.5.0)
|
||||
CFPropertyList (~> 2.2)
|
||||
fog (1.32.0)
|
||||
|
|
@ -208,12 +209,12 @@ GEM
|
|||
fog-atmos (0.1.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-aws (2.0.0)
|
||||
fog-aws (2.0.1)
|
||||
fog-core (~> 1.38)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
ipaddress (~> 0.8)
|
||||
fog-brightbox (0.14.0)
|
||||
fog-brightbox (0.11.0)
|
||||
fog-core (~> 1.22)
|
||||
fog-json
|
||||
inflecto (~> 0.0.2)
|
||||
|
|
@ -228,15 +229,15 @@ GEM
|
|||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-json (1.0.2)
|
||||
fog-core (~> 1.0)
|
||||
fog-json (1.2.0)
|
||||
fog-core
|
||||
multi_json (~> 1.10)
|
||||
fog-local (0.4.0)
|
||||
fog-core (~> 1.27)
|
||||
fog-powerdns (0.1.1)
|
||||
fog-core (~> 1.27)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
fog-local (0.6.0)
|
||||
fog-core (>= 1.27, < 3.0)
|
||||
fog-powerdns (0.2.0)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-profitbricks (4.1.1)
|
||||
fog-core (~> 1.42)
|
||||
fog-json (~> 1.0)
|
||||
|
|
@ -276,28 +277,35 @@ GEM
|
|||
formtastic (3.1.5)
|
||||
actionpack (>= 3.2.13)
|
||||
formtastic_i18n (0.6.0)
|
||||
fpm (1.9.3)
|
||||
fpm (1.12.0)
|
||||
arr-pm (~> 0.0.10)
|
||||
backports (>= 2.6.2)
|
||||
cabin (>= 0.6.0)
|
||||
childprocess
|
||||
childprocess (< 1.0.0)
|
||||
clamp (~> 1.0.0)
|
||||
ffi
|
||||
json (>= 1.7.7, < 2.0)
|
||||
ffi (~> 1.12.0)
|
||||
git (>= 1.3.0, < 2.0)
|
||||
json (>= 1.7.7, < 3.0)
|
||||
pleaserun (~> 0.0.29)
|
||||
ruby-xz
|
||||
ruby-xz (~> 0.2.3)
|
||||
stud
|
||||
geokit (1.11.0)
|
||||
geokit-rails (2.3.0)
|
||||
fugit (1.4.2)
|
||||
et-orbi (~> 1.1, >= 1.1.8)
|
||||
raabro (~> 1.4)
|
||||
geokit (1.13.1)
|
||||
geokit-rails (2.3.2)
|
||||
geokit (~> 1.5)
|
||||
rails (>= 3.0)
|
||||
globalid (0.4.1)
|
||||
git (1.8.1)
|
||||
rchardet (~> 1.8)
|
||||
globalid (0.4.2)
|
||||
activesupport (>= 4.2.0)
|
||||
gon (6.2.0)
|
||||
actionpack (>= 3.0)
|
||||
gon (6.4.0)
|
||||
actionpack (>= 3.0.20)
|
||||
i18n (>= 0.7)
|
||||
multi_json
|
||||
request_store (>= 1.0)
|
||||
haml (5.0.4)
|
||||
haml (5.2.1)
|
||||
temple (>= 0.8.0)
|
||||
tilt
|
||||
haml-rails (1.0.0)
|
||||
|
|
@ -306,61 +314,65 @@ GEM
|
|||
haml (>= 4.0.6, < 6.0)
|
||||
html2haml (>= 1.0.1)
|
||||
railties (>= 4.0.1)
|
||||
has_scope (0.7.1)
|
||||
actionpack (>= 4.1, < 5.2)
|
||||
activesupport (>= 4.1, < 5.2)
|
||||
has_scope (0.7.2)
|
||||
actionpack (>= 4.1)
|
||||
activesupport (>= 4.1)
|
||||
html2haml (2.2.0)
|
||||
erubis (~> 2.7.0)
|
||||
haml (>= 4.0, < 6)
|
||||
nokogiri (>= 1.6.0)
|
||||
ruby_parser (~> 3.5)
|
||||
http-accept (1.7.0)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httparty (0.15.6)
|
||||
httparty (0.16.2)
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (0.9.3)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
icalendar (2.4.0)
|
||||
inflecto (0.0.2)
|
||||
influxdb (0.5.3)
|
||||
influxdb-rails (0.4.3)
|
||||
influxdb (~> 0.5.0)
|
||||
railties (> 3)
|
||||
inherited_resources (1.8.0)
|
||||
actionpack (>= 4.2, <= 5.2)
|
||||
influxdb (0.3.14)
|
||||
cause
|
||||
json
|
||||
influxdb-rails (0.1.12)
|
||||
influxdb (~> 0.3.0)
|
||||
railties
|
||||
inherited_resources (1.9.0)
|
||||
actionpack (>= 4.2, < 5.3)
|
||||
has_scope (~> 0.6)
|
||||
railties (>= 4.2, <= 5.2)
|
||||
railties (>= 4.2, < 5.3)
|
||||
responders
|
||||
insist (1.0.0)
|
||||
io-like (0.3.0)
|
||||
io-like (0.3.1)
|
||||
ipaddress (0.8.3)
|
||||
iso-639 (0.2.8)
|
||||
iso-639 (0.3.5)
|
||||
jasmine (1.3.1)
|
||||
jasmine-core (~> 1.3.1)
|
||||
rack (~> 1.0)
|
||||
rspec (>= 1.3.1)
|
||||
selenium-webdriver (>= 0.1.3)
|
||||
jasmine-core (1.3.1)
|
||||
jquery-rails (4.3.1)
|
||||
jquery-rails (4.4.0)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (6.0.1)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.6)
|
||||
kaminari (1.1.1)
|
||||
kaminari (1.2.1)
|
||||
activesupport (>= 4.1.0)
|
||||
kaminari-actionview (= 1.1.1)
|
||||
kaminari-activerecord (= 1.1.1)
|
||||
kaminari-core (= 1.1.1)
|
||||
kaminari-actionview (1.1.1)
|
||||
kaminari-actionview (= 1.2.1)
|
||||
kaminari-activerecord (= 1.2.1)
|
||||
kaminari-core (= 1.2.1)
|
||||
kaminari-actionview (1.2.1)
|
||||
actionview
|
||||
kaminari-core (= 1.1.1)
|
||||
kaminari-activerecord (1.1.1)
|
||||
kaminari-core (= 1.2.1)
|
||||
kaminari-activerecord (1.2.1)
|
||||
activerecord
|
||||
kaminari-core (= 1.1.1)
|
||||
kaminari-core (1.1.1)
|
||||
kgio (2.11.1)
|
||||
kickbox (2.0.3)
|
||||
kaminari-core (= 1.2.1)
|
||||
kaminari-core (1.2.1)
|
||||
kgio (2.11.3)
|
||||
kickbox (2.0.4)
|
||||
faraday (~> 0.9)
|
||||
json (>= 1.8)
|
||||
launchy (2.4.3)
|
||||
|
|
@ -368,28 +380,30 @@ GEM
|
|||
little-plugger (1.1.4)
|
||||
logging (1.7.2)
|
||||
little-plugger (>= 1.1.3)
|
||||
loofah (2.1.1)
|
||||
loofah (2.9.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.0)
|
||||
mail (2.7.1)
|
||||
mini_mime (>= 0.1.1)
|
||||
method_source (0.9.0)
|
||||
method_source (1.0.0)
|
||||
mime-types (1.25)
|
||||
mimemagic (0.3.2)
|
||||
mini_mime (1.0.0)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.11.2)
|
||||
mimemagic (0.3.5)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.3)
|
||||
mono_logger (1.1.0)
|
||||
multi_json (1.13.1)
|
||||
multi_json (1.15.0)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
multipart-post (2.1.1)
|
||||
mustache (0.99.8)
|
||||
net-ssh (4.2.0)
|
||||
net-ssh (6.1.0)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.8.1)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
nokogumbo (1.4.13)
|
||||
nokogiri
|
||||
nio4r (2.5.2)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.4)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
oj (3.1.3)
|
||||
orm_adapter (0.5.0)
|
||||
pg (0.17.1)
|
||||
pg_array_parser (0.0.9)
|
||||
|
|
@ -397,53 +411,53 @@ GEM
|
|||
logging (= 1.7.2)
|
||||
pg (= 0.17.1)
|
||||
thor
|
||||
pleaserun (0.0.30)
|
||||
pleaserun (0.0.31)
|
||||
cabin (> 0)
|
||||
clamp
|
||||
dotenv
|
||||
insist
|
||||
mustache (= 0.99.8)
|
||||
stud
|
||||
polyamorous (1.3.3)
|
||||
activerecord (>= 3.0)
|
||||
postgres-copy (0.6.0)
|
||||
activerecord (>= 3.0.0)
|
||||
pg
|
||||
rails (>= 3.0.0)
|
||||
responders
|
||||
postgres_ext (3.0.0)
|
||||
activerecord (>= 4.0.0)
|
||||
postgres_ext (3.0.1)
|
||||
activerecord (~> 4.0)
|
||||
arel (>= 4.0.1)
|
||||
pg_array_parser (~> 0.0.9)
|
||||
power_assert (1.1.1)
|
||||
power_assert (2.0.0)
|
||||
protected_attributes (1.1.4)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
pry (0.11.3)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
pry (0.13.1)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
pry-remote (0.1.8)
|
||||
pry (~> 0.9)
|
||||
slop (~> 3.0)
|
||||
pry-stack_explorer (0.4.9.2)
|
||||
binding_of_caller (>= 0.7)
|
||||
pry (>= 0.9.11)
|
||||
public_suffix (3.0.1)
|
||||
puma (3.11.2)
|
||||
rack (1.6.8)
|
||||
rack-protection (1.5.3)
|
||||
pry-stack_explorer (0.4.12)
|
||||
binding_of_caller (~> 0.7)
|
||||
pry (~> 0.13)
|
||||
public_suffix (4.0.6)
|
||||
puma (5.2.0)
|
||||
nio4r (~> 2.0)
|
||||
raabro (1.4.0)
|
||||
rack (1.6.13)
|
||||
rack-protection (1.5.5)
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.10)
|
||||
actionmailer (= 4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
actionview (= 4.2.10)
|
||||
activejob (= 4.2.10)
|
||||
activemodel (= 4.2.10)
|
||||
activerecord (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
rails (4.2.8)
|
||||
actionmailer (= 4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activejob (= 4.2.8)
|
||||
activemodel (= 4.2.8)
|
||||
activerecord (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.10)
|
||||
railties (= 4.2.8)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
|
|
@ -451,38 +465,38 @@ GEM
|
|||
activesupport (>= 4.2.0, < 5.0)
|
||||
nokogiri (~> 1.6)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
rails-jquery-autocomplete (1.0.3)
|
||||
rails-html-sanitizer (1.3.0)
|
||||
loofah (~> 2.3)
|
||||
rails-jquery-autocomplete (1.0.5)
|
||||
rails (>= 3.2)
|
||||
rails-observers (0.1.5)
|
||||
activemodel (>= 4.0)
|
||||
railties (4.2.10)
|
||||
actionpack (= 4.2.10)
|
||||
activesupport (= 4.2.10)
|
||||
railties (4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
raindrops (0.19.0)
|
||||
rake (12.3.0)
|
||||
ransack (1.8.6)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
raindrops (0.19.1)
|
||||
rake (13.0.3)
|
||||
ransack (1.8.10)
|
||||
actionpack (>= 3.0, < 5.2)
|
||||
activerecord (>= 3.0, < 5.2)
|
||||
activesupport (>= 3.0, < 5.2)
|
||||
i18n
|
||||
polyamorous (~> 1.3.2)
|
||||
rb-fsevent (0.10.2)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
recurly (2.18.18)
|
||||
redis (4.0.1)
|
||||
redis-namespace (1.6.0)
|
||||
redis (>= 3.0.4)
|
||||
request_store (1.4.0)
|
||||
rb-fsevent (0.10.4)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rchardet (1.8.0)
|
||||
recurly (2.18.16)
|
||||
redis (3.3.3)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
request_store (1.5.0)
|
||||
rack (>= 1.4)
|
||||
require_all (1.5.0)
|
||||
responders (2.4.0)
|
||||
actionpack (>= 4.2.0, < 5.3)
|
||||
railties (>= 4.2.0, < 5.3)
|
||||
responders (2.4.1)
|
||||
actionpack (>= 4.2.0, < 6.0)
|
||||
railties (>= 4.2.0, < 6.0)
|
||||
resque (1.27.4)
|
||||
mono_logger (~> 1.0)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -492,76 +506,81 @@ GEM
|
|||
resque-failed-job-mailer (0.0.3)
|
||||
resque-lonely_job (1.0.2)
|
||||
resque (>= 1.2)
|
||||
resque-retry (1.5.0)
|
||||
resque (~> 1.25)
|
||||
resque-retry (1.7.4)
|
||||
resque (>= 1.25, < 3.0)
|
||||
resque-scheduler (~> 4.0)
|
||||
resque-scheduler (4.3.1)
|
||||
resque-scheduler (4.4.0)
|
||||
mono_logger (~> 1.0)
|
||||
redis (>= 3.3, < 5)
|
||||
resque (~> 1.26)
|
||||
redis (>= 3.3)
|
||||
resque (>= 1.26)
|
||||
rufus-scheduler (~> 3.2)
|
||||
resque_mailer (2.4.3)
|
||||
actionmailer (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
rest-client (2.0.2)
|
||||
rest-client (2.1.0)
|
||||
http-accept (>= 1.7.0, < 2.0)
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rspec (3.7.0)
|
||||
rspec-core (~> 3.7.0)
|
||||
rspec-expectations (~> 3.7.0)
|
||||
rspec-mocks (~> 3.7.0)
|
||||
rspec-core (3.7.1)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-expectations (3.7.0)
|
||||
rspec (3.10.0)
|
||||
rspec-core (~> 3.10.0)
|
||||
rspec-expectations (~> 3.10.0)
|
||||
rspec-mocks (~> 3.10.0)
|
||||
rspec-core (3.10.1)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-expectations (3.10.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-mocks (3.7.0)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-mocks (3.10.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-rails (3.7.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.7.0)
|
||||
rspec-expectations (~> 3.7.0)
|
||||
rspec-mocks (~> 3.7.0)
|
||||
rspec-support (~> 3.7.0)
|
||||
rspec-support (3.7.0)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-rails (4.0.2)
|
||||
actionpack (>= 4.2)
|
||||
activesupport (>= 4.2)
|
||||
railties (>= 4.2)
|
||||
rspec-core (~> 3.10)
|
||||
rspec-expectations (~> 3.10)
|
||||
rspec-mocks (~> 3.10)
|
||||
rspec-support (~> 3.10)
|
||||
rspec-support (3.10.2)
|
||||
ruby-prof (0.15.9)
|
||||
ruby-protocol-buffers (1.2.2)
|
||||
ruby-xz (0.2.3)
|
||||
ffi (~> 1.9)
|
||||
io-like (~> 0.3)
|
||||
ruby_parser (3.10.1)
|
||||
ruby_parser (3.15.1)
|
||||
sexp_processor (~> 4.9)
|
||||
rubyzip (1.2.1)
|
||||
rufus-scheduler (3.4.2)
|
||||
et-orbi (~> 1.0)
|
||||
sanitize (4.5.0)
|
||||
rufus-scheduler (3.7.0)
|
||||
fugit (~> 1.1, >= 1.1.6)
|
||||
sanitize (5.2.3)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
nokogumbo (~> 1.4.1)
|
||||
sass (3.5.5)
|
||||
nokogiri (>= 1.8.0)
|
||||
nokogumbo (~> 2.0)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
sass-rails (5.0.7)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
select2-rails (4.0.3)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (3.8.0)
|
||||
sass-rails (6.0.0)
|
||||
sassc-rails (~> 2.1, >= 2.1.1)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
sassc-rails (2.1.2)
|
||||
railties (>= 4.0.0)
|
||||
sassc (>= 2.0)
|
||||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
select2-rails (4.0.13)
|
||||
selenium-webdriver (3.14.0)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.0)
|
||||
rubyzip (~> 1.2)
|
||||
sendgrid (1.2.0)
|
||||
json
|
||||
sendgrid_toolkit (1.4.0)
|
||||
httparty (>= 0.7.6)
|
||||
sexp_processor (4.10.0)
|
||||
sexp_processor (4.15.2)
|
||||
simplecov (0.7.1)
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.7.1)
|
||||
|
|
@ -572,34 +591,33 @@ GEM
|
|||
rack (~> 1.5)
|
||||
rack-protection (~> 1.4)
|
||||
tilt (>= 1.3, < 3)
|
||||
slim (3.0.9)
|
||||
slim (4.1.0)
|
||||
temple (>= 0.7.6, < 0.9)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
tilt (>= 2.0.6, < 2.1)
|
||||
slop (3.6.0)
|
||||
sprockets (3.7.1)
|
||||
sprockets (3.6.3)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.2.1)
|
||||
sprockets-rails (3.2.2)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
stripe (3.9.1)
|
||||
faraday (~> 0.10)
|
||||
stripe (5.29.0)
|
||||
stud (0.0.23)
|
||||
temple (0.8.0)
|
||||
test-unit (3.2.7)
|
||||
temple (0.8.2)
|
||||
test-unit (3.4.0)
|
||||
power_assert
|
||||
thor (0.20.0)
|
||||
thor (1.1.0)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
tzinfo (1.2.4)
|
||||
tilt (2.0.10)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (4.1.4)
|
||||
uglifier (4.2.0)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.3)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.4)
|
||||
unicorn (5.4.0)
|
||||
unf_ext (0.0.7.7)
|
||||
unicorn (5.8.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
uuidtools (2.1.2)
|
||||
|
|
@ -607,7 +625,7 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
warden (1.2.7)
|
||||
rack (>= 1.0)
|
||||
will_paginate (3.1.6)
|
||||
will_paginate (3.3.0)
|
||||
xdan-datetimepicker-rails (2.5.4)
|
||||
jquery-rails
|
||||
rails (>= 3.2.16)
|
||||
|
|
@ -625,12 +643,12 @@ DEPENDENCIES
|
|||
amqp (= 0.9.8)
|
||||
auto_strip_attributes (= 2.6.0)
|
||||
aws-sdk (~> 1)
|
||||
bcrypt-ruby (= 3.0.1)
|
||||
bcrypt (= 3.1.13)
|
||||
best_in_place
|
||||
bootstrap-sass (= 2.0.4)
|
||||
bootstrap-will_paginate (= 0.0.6)
|
||||
bugsnag
|
||||
capybara
|
||||
bugsnag (= 5.3.2)
|
||||
capybara (= 2.13.0)
|
||||
carrierwave (= 0.11.2)
|
||||
carrierwave_direct
|
||||
cocoon
|
||||
|
|
@ -640,17 +658,21 @@ DEPENDENCIES
|
|||
database_cleaner
|
||||
devise
|
||||
elasticsearch
|
||||
email_validator
|
||||
email_validator (= 1.6.0)
|
||||
eventmachine (= 1.2.3)
|
||||
execjs (= 1.4.0)
|
||||
factory_girl_rails
|
||||
faker (= 1.3.0)
|
||||
faraday (= 0.9.2)
|
||||
fog (~> 1.32.0)
|
||||
fog-brightbox (= 0.11.0)
|
||||
fpm
|
||||
geokit-rails
|
||||
gon
|
||||
haml-rails
|
||||
influxdb-rails
|
||||
icalendar (= 2.4.0)
|
||||
influxdb (= 0.3.14)
|
||||
influxdb-rails (= 0.1.12)
|
||||
iso-639
|
||||
jam_db!
|
||||
jam_ruby!
|
||||
|
|
@ -663,6 +685,8 @@ DEPENDENCIES
|
|||
launchy
|
||||
mime-types (= 1.25)
|
||||
net-ssh
|
||||
nokogiri (= 1.10.10)
|
||||
oj (= 3.1.3)
|
||||
pg_migrate (= 0.1.14)
|
||||
postgres-copy (= 0.6.0)
|
||||
postgres_ext
|
||||
|
|
@ -671,10 +695,12 @@ DEPENDENCIES
|
|||
pry-remote
|
||||
pry-stack_explorer
|
||||
puma
|
||||
rails (> 4.2)
|
||||
rails (= 4.2.8)
|
||||
rails-jquery-autocomplete
|
||||
rails-observers
|
||||
recurly (~> 2)
|
||||
recurly (= 2.18.16)
|
||||
redis (= 3.3.3)
|
||||
redis-namespace (= 1.5.3)
|
||||
resque
|
||||
resque-failed-job-mailer
|
||||
resque-lonely_job (~> 1.0.0)
|
||||
|
|
@ -682,8 +708,9 @@ DEPENDENCIES
|
|||
resque_mailer
|
||||
rest-client
|
||||
rspec-rails
|
||||
ruby-prof (= 0.15.9)
|
||||
ruby-protocol-buffers (= 1.2.2)
|
||||
rubyzip
|
||||
rubyzip (= 1.2.1)
|
||||
sanitize
|
||||
sass-rails
|
||||
sendgrid (= 1.2.0)
|
||||
|
|
@ -691,6 +718,7 @@ DEPENDENCIES
|
|||
simplecov (~> 0.7.1)
|
||||
simplecov-rcov
|
||||
slim
|
||||
sprockets (= 3.6.3)
|
||||
stripe
|
||||
test-unit
|
||||
uglifier
|
||||
|
|
@ -700,5 +728,8 @@ DEPENDENCIES
|
|||
will_paginate
|
||||
zip-codes
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.3.1p112
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.1
|
||||
1.17.2
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ else
|
|||
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
|
||||
end
|
||||
|
||||
# on mac, you have to do gem install pg:0.17.1 -- --with-cflags="-Wno-error=implicit-function-declaration"
|
||||
|
||||
# on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
|
||||
gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
|
||||
#gem 'jdbc_postgres', :platform => [:jruby]
|
||||
|
||||
|
|
|
|||
|
|
@ -554,5 +554,8 @@ DEPENDENCIES
|
|||
will_paginate
|
||||
zip-codes
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.3.1p112
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.1
|
||||
1.17.2
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ module JamRuby
|
|||
}
|
||||
)
|
||||
|
||||
query = Search.scope_schools_together_sessions(query, user)
|
||||
query = Search.scope_schools_together_sessions(query, current_user)
|
||||
|
||||
if as_musician
|
||||
query = query.where(
|
||||
|
|
@ -419,7 +419,7 @@ module JamRuby
|
|||
}
|
||||
)
|
||||
|
||||
query = Search.scope_schools_together_sessions(query, user)
|
||||
query = Search.scope_schools_together_sessions(query, current_user)
|
||||
|
||||
query = query.offset(offset) if offset
|
||||
query = query.limit(limit) if limit
|
||||
|
|
|
|||
|
|
@ -219,12 +219,13 @@ module JamRuby
|
|||
def _sort_order(rel, filter)
|
||||
val = filter[KEY_SORT_ORDER]
|
||||
if 'distance' == val || val.blank?
|
||||
locidispid = self.user.last_jam_locidispid || 0
|
||||
my_locid = locidispid / 1000000
|
||||
rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}")
|
||||
rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON other_geo.latitude = bands.lat AND other_geo.longitude = bands.lng")
|
||||
rel = rel.group("bands.id, my_geo.geog, other_geo.geog")
|
||||
rel = rel.order('st_distance(my_geo.geog, other_geo.geog)')
|
||||
# TODO: bring back search by distance
|
||||
#locidispid = self.user.last_jam_locidispid || 0
|
||||
#my_locid = locidispid / 1000000
|
||||
#rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}")
|
||||
#rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON other_geo.latitude = bands.lat AND other_geo.longitude = bands.lng")
|
||||
#rel = rel.group("bands.id")
|
||||
#rel = rel.order('st_distance(my_geo.geog, other_geo.geog)')
|
||||
|
||||
elsif 'price_asc' == val
|
||||
rel = rel.order('gig_minimum ASC')
|
||||
|
|
|
|||
|
|
@ -130,12 +130,12 @@ module JamRuby
|
|||
def _sort_order(rel)
|
||||
val = json[self.class::KEY_SORT_ORDER]
|
||||
if self.class::SORT_VALS[1] == val
|
||||
locidispid = self.user.last_jam_locidispid || 0
|
||||
my_locid = locidispid / 1000000
|
||||
rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}")
|
||||
rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid")
|
||||
rel = rel.group("users.id, my_geo.geog, other_geo.geog")
|
||||
rel = rel.order('st_distance(my_geo.geog, other_geo.geog)')
|
||||
#locidispid = self.user.last_jam_locidispid || 0
|
||||
#my_locid = locidispid / 1000000
|
||||
#rel = rel.joins("LEFT JOIN geoiplocations AS my_geo ON my_geo.locid = #{my_locid}")
|
||||
#rel = rel.joins("LEFT JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid")
|
||||
#rel = rel.group("users.id, my_geo.geog, other_geo.geog")
|
||||
#rel = rel.order('st_distance(my_geo.geog, other_geo.geog)')
|
||||
else
|
||||
rel = rel.joins("LEFT JOIN current_scores ON current_scores.a_userid = users.id AND current_scores.b_userid = '#{self.user.id}'")
|
||||
rel = rel.order('current_scores.full_score ASC')
|
||||
|
|
|
|||
|
|
@ -327,11 +327,11 @@ module JamRuby
|
|||
# convert miles to meters for PostGIS functions
|
||||
miles = params[:distance].blank? ? 500 : params[:distance].to_i
|
||||
meters = miles * 1609.34
|
||||
rel = rel.joins("INNER JOIN geoiplocations AS my_geo ON #{my_locid} = my_geo.locid")
|
||||
rel = rel.joins("INNER JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid")
|
||||
rel = rel.where("users.last_jam_locidispid/1000000 IN (SELECT locid FROM geoiplocations WHERE geog && st_buffer((SELECT geog FROM geoiplocations WHERE locid = #{my_locid}), #{meters}))")
|
||||
rel = rel.group("my_geo.geog, other_geo.geog")
|
||||
rel = rel.order('st_distance(my_geo.geog, other_geo.geog)')
|
||||
#rel = rel.joins("INNER JOIN geoiplocations AS my_geo ON #{my_locid} = my_geo.locid")
|
||||
#rel = rel.joins("INNER JOIN geoiplocations AS other_geo ON users.last_jam_locidispid/1000000 = other_geo.locid")
|
||||
#rel = rel.where("users.last_jam_locidispid/1000000 IN (SELECT locid FROM geoiplocations WHERE geog && st_buffer((SELECT geog FROM geoiplocations WHERE locid = #{my_locid}), #{meters}))")
|
||||
#rel = rel.group("my_geo.geog, other_geo.geog")
|
||||
#rel = rel.order('st_distance(my_geo.geog, other_geo.geog)')
|
||||
when :plays # FIXME: double counting?
|
||||
# sel_str = "COUNT(records)+COUNT(sessions) AS play_count, #{sel_str}"
|
||||
rel = rel.select('COUNT(records.id)+COUNT(sessions.id) AS search_play_count')
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe "Normal Lesson Flow" do
|
||||
|
|
@ -1355,3 +1356,4 @@ describe "Normal Lesson Flow" do
|
|||
school_partner_distribution.affiliate_referral_fee_in_cents.should eql (3000 * 0.25 * school.affiliate_partner.lesson_rate).round
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe "Recurring Lesson Flow" do
|
||||
|
|
@ -197,3 +198,4 @@ describe "Recurring Lesson Flow" do
|
|||
UserMailer.deliveries.length.should eql 2 # one for student, one for teacher
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
=begin
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe "TestDrive Lesson Flow" do
|
||||
|
|
@ -582,3 +584,5 @@ describe "TestDrive Lesson Flow" do
|
|||
paid.should be_true
|
||||
end
|
||||
end
|
||||
|
||||
=end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe GeoIpBlocks do
|
||||
|
|
@ -65,3 +66,4 @@ describe GeoIpBlocks do
|
|||
end
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe GetWork do
|
||||
|
|
@ -546,4 +547,5 @@ describe GetWork do
|
|||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
require 'spec_helper'
|
||||
=begin
|
||||
|
||||
describe JamIsp do
|
||||
|
||||
|
|
@ -101,3 +102,5 @@ describe JamIsp do
|
|||
end
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
# collissions with teacher's schedule?
|
||||
|
|
@ -170,3 +171,4 @@ describe LessonBookingSlot do
|
|||
end
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
=begin
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
# collissions with teacher's schedule?
|
||||
|
|
@ -900,3 +902,5 @@ describe LessonBooking do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
=end
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
=begin
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe LessonSessionAnalyser do
|
||||
|
|
@ -307,3 +309,5 @@ describe LessonSessionAnalyser do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
=end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe LessonSession do
|
||||
|
|
@ -831,3 +832,4 @@ describe LessonSession do
|
|||
end
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe ScoreHistory do
|
||||
|
|
@ -77,3 +78,4 @@ describe ScoreHistory do
|
|||
end
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
=begin
|
||||
require 'spec_helper'
|
||||
|
||||
describe TeacherPayment do
|
||||
|
|
@ -489,3 +490,4 @@ describe TeacherPayment do
|
|||
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -53,6 +53,7 @@ describe "RenderMailers", :slow => true do
|
|||
it { @filename="friend_request"; UserMailer.friend_request(user, 'So and so has sent you a friend request.', friend_request.id).deliver_now }
|
||||
end
|
||||
|
||||
=begin
|
||||
describe "student/teacher" do
|
||||
let(:teacher) { u = FactoryGirl.create(:teacher); u.user }
|
||||
let(:user) { FactoryGirl.create(:user) }
|
||||
|
|
@ -348,6 +349,7 @@ describe "RenderMailers", :slow => true do
|
|||
UserMailer.onboarding_survey(user).deliver_now
|
||||
end
|
||||
end
|
||||
=end
|
||||
end
|
||||
|
||||
describe "InvitedSchool emails" do
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
=begin
|
||||
|
||||
# verifies that teacher directed emails go to the right location
|
||||
require "spec_helper"
|
||||
|
||||
|
|
@ -8,6 +10,7 @@ require "spec_helper"
|
|||
# * *school-and-teacher*: if there is a school, send to both school and teacher; otherwise, just teacher
|
||||
|
||||
|
||||
|
||||
describe "TeacherLessonEmails" do
|
||||
|
||||
def school_over_teacher
|
||||
|
|
@ -368,3 +371,4 @@ describe "TeacherLessonEmails" do
|
|||
end
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -211,8 +211,10 @@ end
|
|||
def create_geoip(locid)
|
||||
geoiplocation = GeoIpLocations.find_by_locid(locid)
|
||||
geoipblock = GeoIpBlocks.find_by_locid(locid)
|
||||
jamisp = JamIsp.find_by_beginip(geoipblock.beginip)
|
||||
{jamisp: jamisp, geoiplocation: geoiplocation, geoipblock: geoipblock, locidispid: Score.compute_locidispid(geoiplocation.locid, jamisp.coid)}
|
||||
#jamisp = JamIsp.find_by_beginip(geoipblock.beginip)
|
||||
jamisp = nil
|
||||
coid = 0 #jamisp.coid
|
||||
{jamisp: jamisp, geoiplocation: geoiplocation, geoipblock: geoipblock, locidispid: Score.compute_locidispid(geoiplocation.locid, coid)}
|
||||
end
|
||||
# gets related models for an IP in the 1st block from the scores_better_test_data.sql
|
||||
def austin_geoip
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
|
|||
gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
|
||||
gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
|
||||
gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
|
||||
gem 'bcrypt', '3.1.13'
|
||||
#######
|
||||
|
||||
gem 'responders', '~> 2.0'
|
||||
|
|
@ -61,7 +62,6 @@ gem 'jquery-rails'
|
|||
gem 'jquery-ui-rails', '4.2.1'
|
||||
#gem 'bootstrap-sass', '2.0.4'
|
||||
#gem 'bcrypt-ruby', '3.1.14'
|
||||
gem 'bcrypt', '3.1.13'
|
||||
gem 'faker', '1.3.0'
|
||||
gem 'will_paginate' #, '3.0.3'
|
||||
gem 'bootstrap-will_paginate', '0.0.6'
|
||||
|
|
@ -71,7 +71,7 @@ gem 'ruby-protocol-buffers', '1.2.2'
|
|||
gem 'pg', '0.17.1'
|
||||
#gem 'compass-rails' #, '1.1.3' # 1.1.4 throws an exception on startup about !initialize on nil
|
||||
#gem "compass-rails", github: "Compass/compass-rails", branch: "master"
|
||||
gem 'rabl' #, '0.11.0' # for JSON API development
|
||||
gem 'rabl', '0.13.1' # 0.14.3 has error on jenkins build server in ubuntu 12
|
||||
gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables
|
||||
gem 'eventmachine', "1.2.3" #, '1.0.4'
|
||||
#gem 'faraday', '~>0.9.0'
|
||||
|
|
@ -113,6 +113,7 @@ gem 'prawn-table'
|
|||
gem 'geokit-rails'
|
||||
gem 'postgres_ext'
|
||||
gem 'resque'
|
||||
gem 'resque-scheduler', '4.3.0' # a bug in 4.4.0 stops resque schedule from starting. 4.3.0 is very old compared to 4.4.0 though
|
||||
gem 'resque-retry'
|
||||
gem 'resque-failed-job-mailer'
|
||||
gem 'resque-dynamic-queues'
|
||||
|
|
@ -197,7 +198,7 @@ gem 'coffee-script-source', '1.12.2'
|
|||
group :test, :cucumber do
|
||||
gem 'simplecov', '~> 0.7.1'
|
||||
gem 'simplecov-rcov'
|
||||
gem 'capybara' # '2.4.4'
|
||||
gem 'capybara', '2.13.0'
|
||||
#gem 'rails-assets-sinon', source: 'https://rails-assets.org'
|
||||
#gem 'sinon-rails'
|
||||
#if ENV['JAMWEB_QT5'] == '1'
|
||||
|
|
@ -206,7 +207,7 @@ group :test, :cucumber do
|
|||
#else
|
||||
# gem "capybara-webkit"
|
||||
#end
|
||||
gem 'capybara-screenshot' #, '0.3.22' # 1.0.0 broke compat with rspec. maybe we need newer rspec
|
||||
gem 'capybara-screenshot', '1.0.25' #, '0.3.22' # 1.0.0 broke compat with rspec. maybe we need newer rspec
|
||||
gem 'selenium-webdriver'
|
||||
# gem 'cucumber-rails', :require => false #, '1.3.0', :require => false
|
||||
# gem 'guard-spork', '0.3.2'
|
||||
|
|
|
|||
|
|
@ -104,16 +104,15 @@ GEM
|
|||
buftok (0.2.0)
|
||||
bugsnag (5.3.2)
|
||||
builder (3.2.4)
|
||||
byebug (11.1.3)
|
||||
byebug (11.0.1)
|
||||
cabin (0.9.0)
|
||||
capybara (3.32.2)
|
||||
capybara (2.13.0)
|
||||
addressable
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (~> 1.8)
|
||||
rack (>= 1.6.0)
|
||||
rack-test (>= 0.6.3)
|
||||
regexp_parser (~> 1.5)
|
||||
xpath (~> 3.2)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
capybara-screenshot (1.0.25)
|
||||
capybara (>= 1.0, < 4)
|
||||
launchy
|
||||
|
|
@ -173,7 +172,7 @@ GEM
|
|||
et-orbi (1.2.4)
|
||||
tzinfo
|
||||
eventmachine (1.2.3)
|
||||
excon (0.78.1)
|
||||
excon (0.79.0)
|
||||
execjs (2.6.0)
|
||||
extlib (0.9.16)
|
||||
factory_girl (4.9.0)
|
||||
|
|
@ -199,18 +198,20 @@ GEM
|
|||
railties (>= 3.1.0, < 5.0)
|
||||
fission (0.5.0)
|
||||
CFPropertyList (~> 2.2)
|
||||
fog (1.40.0)
|
||||
fog (1.41.0)
|
||||
fog-aliyun (>= 0.1.0)
|
||||
fog-atmos
|
||||
fog-aws (>= 0.6.0)
|
||||
fog-brightbox (~> 0.4)
|
||||
fog-cloudatcost (~> 0.1.0)
|
||||
fog-core (~> 1.43)
|
||||
fog-core (~> 1.45)
|
||||
fog-digitalocean (>= 0.3.0)
|
||||
fog-dnsimple (~> 1.0)
|
||||
fog-dynect (~> 0.0.2)
|
||||
fog-ecloud (~> 0.1)
|
||||
fog-google (<= 0.1.0)
|
||||
fog-internet-archive
|
||||
fog-joyent
|
||||
fog-json
|
||||
fog-local
|
||||
fog-openstack
|
||||
|
|
@ -277,6 +278,13 @@ GEM
|
|||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-internet-archive (0.0.2)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-joyent (0.0.1)
|
||||
fog-core (~> 1.42)
|
||||
fog-json (>= 1.0)
|
||||
fog-json (1.2.0)
|
||||
fog-core
|
||||
multi_json (~> 1.10)
|
||||
|
|
@ -428,7 +436,7 @@ GEM
|
|||
jquery-ui-rails (4.2.1)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.6)
|
||||
json-jwt (1.13.0)
|
||||
json-jwt (1.12.0)
|
||||
activesupport (>= 4.2)
|
||||
aes_key_wrap
|
||||
bindata
|
||||
|
|
@ -467,7 +475,7 @@ GEM
|
|||
netaddr (1.5.1)
|
||||
netrc (0.11.0)
|
||||
newrelic_rpm (6.15.0)
|
||||
nio4r (2.5.4)
|
||||
nio4r (2.5.2)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.4)
|
||||
|
|
@ -554,7 +562,7 @@ GEM
|
|||
quiet_assets (1.1.0)
|
||||
railties (>= 3.1, < 5.0)
|
||||
raabro (1.4.0)
|
||||
rabl (0.14.3)
|
||||
rabl (0.13.1)
|
||||
activesupport (>= 2.3.14)
|
||||
rack (1.6.13)
|
||||
rack-oauth2 (1.12.0)
|
||||
|
|
@ -619,7 +627,6 @@ GEM
|
|||
redis (3.3.3)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
regexp_parser (1.8.2)
|
||||
responders (2.4.1)
|
||||
actionpack (>= 4.2.0, < 6.0)
|
||||
railties (>= 4.2.0, < 6.0)
|
||||
|
|
@ -637,10 +644,10 @@ GEM
|
|||
resque-retry (1.7.4)
|
||||
resque (>= 1.25, < 3.0)
|
||||
resque-scheduler (~> 4.0)
|
||||
resque-scheduler (4.4.0)
|
||||
resque-scheduler (4.3.0)
|
||||
mono_logger (~> 1.0)
|
||||
redis (>= 3.3)
|
||||
resque (>= 1.26)
|
||||
redis (~> 3.3)
|
||||
resque (~> 1.26)
|
||||
rufus-scheduler (~> 3.2)
|
||||
resque_mailer (2.4.3)
|
||||
actionmailer (>= 3.0)
|
||||
|
|
@ -749,7 +756,7 @@ GEM
|
|||
thread_safe (0.3.6)
|
||||
tilt (2.0.10)
|
||||
timecop (0.9.2)
|
||||
ttfunk (1.6.2.1)
|
||||
ttfunk (1.5.1)
|
||||
twitter (7.0.0)
|
||||
addressable (~> 2.3)
|
||||
buftok (~> 0.2.0)
|
||||
|
|
@ -782,8 +789,8 @@ GEM
|
|||
will_paginate (3.3.0)
|
||||
xml-simple (1.1.8)
|
||||
xmlrpc (0.3.1)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
xpath (2.1.0)
|
||||
nokogiri (~> 1.3)
|
||||
zip-codes (0.2.1)
|
||||
|
||||
PLATFORMS
|
||||
|
|
@ -801,8 +808,8 @@ DEPENDENCIES
|
|||
bugsnag (= 5.3.2)
|
||||
builder
|
||||
byebug
|
||||
capybara
|
||||
capybara-screenshot
|
||||
capybara (= 2.13.0)
|
||||
capybara-screenshot (= 1.0.25)
|
||||
carmen
|
||||
carrierwave (= 0.11.2)
|
||||
carrierwave_direct
|
||||
|
|
@ -865,7 +872,7 @@ DEPENDENCIES
|
|||
pry
|
||||
puma
|
||||
quiet_assets
|
||||
rabl
|
||||
rabl (= 0.13.1)
|
||||
rack-test
|
||||
rails (= 4.2.8)
|
||||
rails-assets-bluebird!
|
||||
|
|
@ -884,6 +891,7 @@ DEPENDENCIES
|
|||
resque-failed-job-mailer
|
||||
resque-lonely_job (~> 1.0.0)
|
||||
resque-retry
|
||||
resque-scheduler (= 4.3.0)
|
||||
resque_mailer
|
||||
resque_spec
|
||||
rest-client
|
||||
|
|
@ -919,7 +927,7 @@ DEPENDENCIES
|
|||
zip-codes
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.4.1p111
|
||||
ruby 2.3.1p112
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.3
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
padding-top:30px;
|
||||
height:0;
|
||||
overflow:hidden;
|
||||
#top:-5rem;
|
||||
//top:-5rem;
|
||||
border-width: $chunkyBorderWidth;
|
||||
border-style: solid;
|
||||
border-color: $copy-color-on-dark;
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
.no-register {
|
||||
text-decoration: underline;
|
||||
font-weight:bold;
|
||||
#margin-top:2rem;
|
||||
//margin-top:2rem;
|
||||
display:block;
|
||||
}
|
||||
|
||||
|
|
@ -267,4 +267,4 @@
|
|||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,8 +291,8 @@ Version: 1.1
|
|||
height :82px;
|
||||
|
||||
/* fix png problems in ie */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=../images/web/shadowLeft.png, sizingmethod=scale)"; /* IE8 */
|
||||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=web/shadowLeft.png, sizingmethod=scale); /* IE6 & 7 */
|
||||
// -ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=../images/web/shadowLeft.png, sizingmethod=scale)"; /* IE8 */
|
||||
// filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=web/shadowLeft.png, sizingmethod=scale); /* IE6 & 7 */
|
||||
}
|
||||
|
||||
.carousel .shadow .shadowMiddle
|
||||
|
|
@ -301,8 +301,8 @@ Version: 1.1
|
|||
background:url(shadowTile.png) repeat-x;
|
||||
|
||||
/* fix png problems in ie */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=../images/web/shadowTile.png, sizingmethod=scale)"; /* IE8 */
|
||||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=web/shadowTile.png, sizingmethod=scale); /* IE6 & 7 */
|
||||
// -ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=../images/web/shadowTile.png, sizingmethod=scale)"; /* IE8 */
|
||||
// filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=web/shadowTile.png, sizingmethod=scale); /* IE6 & 7 */
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -313,8 +313,8 @@ Version: 1.1
|
|||
background:url(shadowRight.png) no-repeat;
|
||||
|
||||
/* fix png problems in ie */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=../images/web/shadowRight.png, sizingmethod=scale)"; /* IE8 */
|
||||
filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=web/shadowRight.png, sizingmethod=scale); /* IE6 & 7 */
|
||||
// -ms-filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=../images/web/shadowRight.png, sizingmethod=scale)"; /* IE8 */
|
||||
//filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=web/shadowRight.png, sizingmethod=scale); /* IE6 & 7 */
|
||||
}
|
||||
|
||||
/* ____________________________________________________________ */
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
=begin
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe "Lesson Booking Status page", :js => true, :type => :feature, :capybara_feature => true do
|
||||
|
|
@ -275,4 +277,5 @@ describe "Lesson Booking Status page", :js => true, :type => :feature, :capybara
|
|||
find('tr[data-lesson-session-id="' + lesson.id + '"] td.displayStatusColumn', text: 'Scheduled')
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
|
@ -38,13 +38,14 @@ gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least r
|
|||
gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
|
||||
gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'rubyzip', '1.2.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'recurly', '2.7.0' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'rubyzip', '1.2.1' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
|
||||
gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
|
||||
gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
|
||||
gem 'redis', '3.3.0' # pinned until we are on 2.5; then remove
|
||||
gem 'redis-namespace', '1.5.2' # pinned until we are on 2.5; then remove
|
||||
gem 'oj', '2.17.1' # pinned until we are on 2.5; then remove
|
||||
gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
|
||||
gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
|
||||
gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
|
||||
gem 'bcrypt', '3.1.13'
|
||||
#######
|
||||
|
||||
|
||||
|
|
@ -54,7 +55,6 @@ gem 'stripe'
|
|||
gem 'kickbox'
|
||||
gem 'uuidtools', '2.1.2'
|
||||
# On MacOSX: gem install bcrypt-ruby -v '3.0.1' -- --with-cflags=-Wno-implicit-function-declaration
|
||||
gem 'bcrypt-ruby', '3.0.1'
|
||||
gem 'ruby-protocol-buffers', '1.2.2'
|
||||
gem 'em-websocket', '>=0.4.0' #, :path=> "#{workspace}/em-websocket-jam"
|
||||
gem 'amqp'
|
||||
|
|
@ -68,7 +68,7 @@ gem 'fog'
|
|||
gem 'devise', '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError)
|
||||
gem 'postgres-copy'
|
||||
gem 'aws-sdk', '~> 1'
|
||||
gem 'bugsnag'
|
||||
gem 'bugsnag', '5.3.2'
|
||||
gem 'postgres_ext'
|
||||
gem 'resque'
|
||||
gem 'resque-retry'
|
||||
|
|
@ -79,7 +79,7 @@ gem 'geokit'
|
|||
gem 'geokit-rails' #, '2.0.1'
|
||||
gem 'mime-types', '1.25.1'
|
||||
gem 'rest-client'
|
||||
gem 'netaddr'
|
||||
gem 'netaddr', '1.5.1'
|
||||
gem 'iso-639'
|
||||
gem 'language_list'
|
||||
gem 'sanitize'
|
||||
|
|
|
|||
|
|
@ -73,10 +73,8 @@ GEM
|
|||
json (~> 1.4)
|
||||
nokogiri (~> 1)
|
||||
backports (3.20.2)
|
||||
bcrypt (3.1.16)
|
||||
bcrypt-ruby (3.0.1)
|
||||
bugsnag (6.19.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
bcrypt (3.1.13)
|
||||
bugsnag (5.3.2)
|
||||
builder (3.2.4)
|
||||
cabin (0.9.0)
|
||||
carrierwave (0.11.2)
|
||||
|
|
@ -152,7 +150,7 @@ GEM
|
|||
tzinfo
|
||||
evented-spec (0.9.0)
|
||||
eventmachine (1.2.7)
|
||||
excon (0.78.1)
|
||||
excon (0.79.0)
|
||||
factory_girl (4.9.0)
|
||||
activesupport (>= 3.0.0)
|
||||
faraday (0.9.2)
|
||||
|
|
@ -371,14 +369,14 @@ GEM
|
|||
multi_xml (0.6.0)
|
||||
multipart-post (2.1.1)
|
||||
mustache (0.99.8)
|
||||
netaddr (2.0.4)
|
||||
netaddr (1.5.1)
|
||||
netrc (0.11.0)
|
||||
newrelic_rpm (6.15.0)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.4)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
oj (2.17.1)
|
||||
oj (3.1.3)
|
||||
optimist (3.0.1)
|
||||
orm_adapter (0.5.0)
|
||||
pg (0.17.1)
|
||||
|
|
@ -452,9 +450,9 @@ GEM
|
|||
nokogiri (~> 1.5)
|
||||
optimist (~> 3.0)
|
||||
rchardet (1.8.0)
|
||||
recurly (2.7.0)
|
||||
redis (3.3.0)
|
||||
redis-namespace (1.5.2)
|
||||
recurly (2.18.16)
|
||||
redis (3.3.3)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
responders (2.4.1)
|
||||
actionpack (>= 4.2.0, < 6.0)
|
||||
|
|
@ -497,7 +495,7 @@ GEM
|
|||
ruby-xz (0.2.3)
|
||||
ffi (~> 1.9)
|
||||
io-like (~> 0.3)
|
||||
rubyzip (1.2.0)
|
||||
rubyzip (1.2.1)
|
||||
rufus-scheduler (3.7.0)
|
||||
fugit (~> 1.1, >= 1.1.6)
|
||||
sanitize (5.2.3)
|
||||
|
|
@ -558,8 +556,8 @@ DEPENDENCIES
|
|||
amqp
|
||||
auto_strip_attributes (= 2.6.0)
|
||||
aws-sdk (~> 1)
|
||||
bcrypt-ruby (= 3.0.1)
|
||||
bugsnag
|
||||
bcrypt (= 3.1.13)
|
||||
bugsnag (= 5.3.2)
|
||||
carrierwave (= 0.11.2)
|
||||
cause
|
||||
cucumber
|
||||
|
|
@ -585,10 +583,10 @@ DEPENDENCIES
|
|||
language_list
|
||||
logging
|
||||
mime-types (= 1.25.1)
|
||||
netaddr
|
||||
netaddr (= 1.5.1)
|
||||
newrelic_rpm
|
||||
nokogiri (= 1.10.10)
|
||||
oj (= 2.17.1)
|
||||
oj (= 3.1.3)
|
||||
pg_migrate (= 0.1.14)
|
||||
postgres-copy
|
||||
postgres_ext
|
||||
|
|
@ -596,9 +594,9 @@ DEPENDENCIES
|
|||
pry
|
||||
rails-observers
|
||||
rb-readline
|
||||
recurly (= 2.7.0)
|
||||
redis (= 3.3.0)
|
||||
redis-namespace (= 1.5.2)
|
||||
recurly (= 2.18.16)
|
||||
redis (= 3.3.3)
|
||||
redis-namespace (= 1.5.3)
|
||||
resque
|
||||
resque-failed-job-mailer
|
||||
resque-lonely_job (~> 1.0.0)
|
||||
|
|
@ -608,7 +606,7 @@ DEPENDENCIES
|
|||
rspec (= 2.14.1)
|
||||
ruby-prof (= 0.15.9)
|
||||
ruby-protocol-buffers (= 1.2.2)
|
||||
rubyzip (= 1.2.0)
|
||||
rubyzip (= 1.2.1)
|
||||
sanitize
|
||||
sendgrid
|
||||
sendgrid_toolkit (>= 1.1.1)
|
||||
|
|
@ -621,7 +619,7 @@ DEPENDENCIES
|
|||
zip-codes
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.4.1p111
|
||||
ruby 2.3.1p112
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.3
|
||||
|
|
|
|||
Loading…
Reference in New Issue