Merge pull request #49 from python/revert-branch-pin

Revert "carry over rogue patch from old box"

Author: ambv

codespeed/settings.py

@@ -4,11 +4,7 @@
 ## General default options ##
 WEBSITE_NAME = "MySpeedSite" # This name will be used in the reports RSS feed
 
-DEF_ENVIRONMENT = None #Name of the environment which should be selected as default
-
-DEF_BRANCH = "master" # Defines the default branch to be used.
-                       # In git projects, this branch is usually be calles
-                       # "master"
+DEF_ENVIRONMENT = None # Name of the environment which should be selected as default
 
 DEF_BASELINE = None # Which executable + revision should be default as a baseline
                     # Given as the name of the executable and commitid of the revision

codespeed/views.py

@@ -552,8 +552,8 @@ def timeline(request):
     branch_list.sort()
 
     defaultbranch = ""
-    if settings.DEF_BRANCH in branch_list:
-        defaultbranch = settings.DEF_BRANCH
+    if defaultproject.default_branch in branch_list:
+        defaultbranch = defaultproject.default_branch
     if data.get('bran') in branch_list:
         defaultbranch = data.get('bran')