diff --git a/admin/Gemfile.lock b/admin/Gemfile.lock index 41b557c55..8abef39c6 100644 --- a/admin/Gemfile.lock +++ b/admin/Gemfile.lock @@ -464,7 +464,7 @@ GEM oj (3.1.3) optimist (3.0.1) orm_adapter (0.5.0) - pg (0.21.0) + pg (0.17.1) pg_array_parser (0.0.9) pleaserun (0.0.31) cabin (> 0) @@ -748,7 +748,7 @@ DEPENDENCIES net-ssh nokogiri (= 1.10.10) oj (= 3.1.3) - pg (= 0.21.0) + pg (= 0.17.1) postgres-copy (= 0.6.0) postgres_ext protected_attributes diff --git a/admin/app/admin/affiliate_users.rb b/admin/app/admin/affiliate_users.rb index d2aa99969..1658d926d 100644 --- a/admin/app/admin/affiliate_users.rb +++ b/admin/app/admin/affiliate_users.rb @@ -8,17 +8,12 @@ ActiveAdmin.register JamRuby::User, :as => 'Referrals' do config.filters = true filter :affiliate_referral - filter :email - - ## scope("Has Signups", default: true) { |scope| scope.where('visits != 0 or signups != 0').order('day desc') } index do column 'User' do |oo| link_to(oo.name, oo.admin_url, {:title => oo.name}) end - column 'User Email' do |oo| oo.email end + column 'Email' do |oo| oo.email end column 'Created' do |oo| oo.created_at end - column 'Partner ID' do |oo| oo.affiliate_referral.id end - column 'Partner Name' do |oo| oo.affiliate_referral.display_name end - column 'Partner User' do |oo| link_to(oo.affiliate_referral.partner_user.name, admin_user_path(oo.affiliate_referral.partner_user.id), { :title => oo.affiliate_referral.partner_user.name }) end + column 'Partner' do |oo| oo.affiliate_referral.display_name end end controller do diff --git a/web/Gemfile.lock b/web/Gemfile.lock index ed9c32e11..640845cc9 100644 --- a/web/Gemfile.lock +++ b/web/Gemfile.lock @@ -519,7 +519,7 @@ GEM paypal-sdk-merchant-jk (1.118.1) paypal-sdk-core (~> 0.3.0) pdf-core (0.7.0) - pg (0.21.0) + pg (0.17.1) pg_array_parser (0.0.9) pleaserun (0.0.31) cabin (> 0) @@ -868,7 +868,7 @@ DEPENDENCIES omniauth-stripe-connect omniauth-twitter paypal-sdk-merchant-jk (= 1.118.1) - pg (= 0.21.0) + pg (= 0.17.1) postgres-copy postgres_ext prawn-table @@ -936,7 +936,7 @@ DEPENDENCIES zip-codes RUBY VERSION - ruby 2.4.1p111 + ruby 2.3.1p112 BUNDLED WITH 1.17.3 diff --git a/web/bin/start b/web/bin/start index b8f19bafe..1bc4a496e 100755 --- a/web/bin/start +++ b/web/bin/start @@ -3,7 +3,6 @@ #REAL_IP=192.168.0.42 REAL_IP=127.0.0.1 REAL_IP=192.168.5.204 -REAL_IP=127.0.0.1 if [ ! -z "$1" ]; then REAL_IP="$1" fi