From 1a3549903c88ac31e274032c9fd8b2119da6d85e Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Thu, 12 Jul 2012 13:41:51 -0400
Subject: [PATCH] updating activation mail, adding Gemfile.lock to gitignore

---
 .gitignore                                | 1 +
 lms/templates/emails/activation_email.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ef28575da5..a5f95df18f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ reports/
 /src/
 \#*\#
 *.egg-info
+Gemfile.lock
diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index eca5effdd6..5d5f980156 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -6,7 +6,7 @@ this address into your web browser's address bar:
 % if is_secure:
   https://${ site }/activate/${ key }
 % else:
-  http://edx4edx.mitx.mit.edu/activate/${ key }
+  http://${ site }/activate/${ key }
 % endif
 
 If you didn't request this, you don't need to do anything; you won't