Browse files

Merge branch '1.4.5.1' into dev

  • Loading branch information...
2 parents 5961e87 + 9a0ebed commit c89b2cf28000aa518f32d18c894edb5a8581c3d0 @camd camd committed Mar 29, 2013
Showing with 19 additions and 2 deletions.
  1. +5 −0 docs/installation.rst
  2. +11 −0 docs/releasenotes.rst
  3. +2 −1 moztrap/model/environments/api.py
  4. +1 −1 moztrap/settings/base.py
View
5 docs/installation.rst
@@ -67,6 +67,11 @@ Python projects on your system, create the virtualenv and activate it. Then run
``bin/install-reqs`` to install the dependencies for this project into your
Python environment.
+.. Note::
+
+On some linux flavors, you may need to run
+``sudo apt-get install libmysqlclient-dev`` prior to bin/install-reqs.
+
Installing the dependencies requires `pip`_ 1.0 or higher. `pip`_ is
automatically available in a `virtualenv`_; if not using `virtualenv`_ you may
need to install it yourself.
View
11 docs/releasenotes.rst
@@ -1,6 +1,17 @@
Release Notes
=============
+
+Version 1.4.5
+-------------
+*release date - 3/28/2013*
+
+* **Upgrade to Django 1.4.5**
+* **Bug fix for order of cases** - Test case order within suites was broken.
+* **Bug fix for repeated cases** - It was possible, in some circumstances to
+ have the same test case shown multiple times in a suite.
+
+
Version 1.4.4
-------------
*release date - 3/22/2013*
View
3 moztrap/model/environments/api.py
@@ -100,7 +100,8 @@ class EnvironmentResource(MTResource):
"""Create, Read and Delete capabilities for environments"""
elements = fields.ToManyField(ElementResource, "elements")
- profile = fields.ForeignKey(ProfileResource, "profile")
+ # an environment is not required to be associated with a profile
+ profile = fields.ForeignKey(ProfileResource, "profile", null=True)
class Meta(MTResource.Meta):
queryset = Environment.objects.all()
View
2 moztrap/settings/base.py
@@ -14,7 +14,7 @@
TEMPLATE_DEBUG = DEBUG
ADMINS = [
- ("Carl Meyer", "cmeyer@mozilla.com"),
+ ("Some One", "someone@mozilla.com"),
]
MANAGERS = ADMINS

0 comments on commit c89b2cf

Please sign in to comment.