From b74ab7fda90230847d8a59829c63a9b0b28078fd Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 1 Oct 2013 21:49:41 +0000
Subject: [PATCH] * removing helper to resolve remote_ip, and doing it the
 'rails' way

---
 web/app/controllers/users_controller.rb | 2 +-
 web/app/helpers/application_helper.rb   | 8 --------
 web/config/application.rb               | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 755a817aa..d8a91e3af 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -31,7 +31,7 @@ class UsersController < ApplicationController
     end
     @signup_postback = load_postback(@invited_user)
 
-    load_location(remote_ip())
+    load_location(request.remote_ip)
 
     @user = User.new
     @user.musician = true # default the UI to musician as selected option
diff --git a/web/app/helpers/application_helper.rb b/web/app/helpers/application_helper.rb
index b7045302b..827379344 100644
--- a/web/app/helpers/application_helper.rb
+++ b/web/app/helpers/application_helper.rb
@@ -18,12 +18,4 @@ module ApplicationHelper
     Rails.application.config.bugsnag_notify_release_stages.include? Rails.env
   end
 
-  def remote_ip
-    if Rails.application.config.proxy_use_x_real_ip
-      request.env['X-Real-IP']
-    else
-      request.remote_ip
-    end
-  end
-
 end
diff --git a/web/config/application.rb b/web/config/application.rb
index 89423a3a5..812a535b1 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -154,7 +154,5 @@ if defined?(Bundler)
 
     config.ga_ua = 'UA-44184562-2' # google analytics
     config.ga_suppress_admin = true
-
-    config.proxy_use_x_real_ip = false
   end
 end