From e9b121b8cd56e21c71dcbd4687a5cf9114425856 Mon Sep 17 00:00:00 2001
From: jagonzalr <antonio@proversity.org>
Date: Mon, 7 Nov 2016 14:44:53 +0200
Subject: [PATCH 1/2] prevent RemovedInDjango19Warnings

---
 lms/djangoapps/grades/models.py | 5 +++++
 requirements/edx/base.txt       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py
index 4a501293bf..e816944972 100644
--- a/lms/djangoapps/grades/models.py
+++ b/lms/djangoapps/grades/models.py
@@ -151,6 +151,9 @@ class VisibleBlocks(models.Model):
 
     objects = VisibleBlocksQuerySet.as_manager()
 
+    class Meta(object):
+        app_label = "grades"
+
     def __unicode__(self):
         """
         String representation of this model.
@@ -208,6 +211,7 @@ class PersistentSubsectionGrade(TimeStampedModel):
     """
 
     class Meta(object):
+        app_label = "grades"
         unique_together = [
             # * Specific grades can be pulled using all three columns,
             # * Progress page can pull all grades for a given (course_id, user_id)
@@ -422,6 +426,7 @@ class PersistentCourseGrade(TimeStampedModel):
     """
 
     class Meta(object):
+        app_label = "grades"
         # Indices:
         # (course_id, user_id) for individual grades
         # (course_id) for instructors to see all course grades, implicitly created via the unique_together constraint
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 3874d07dda..8278f3e730 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -108,7 +108,7 @@ sympy==0.7.1
 xmltodict==0.4.1
 django-ratelimit-backend==1.0
 unicodecsv==0.9.4
-django-require==1.0.6
+django-require==1.0.11
 pyuca==1.1
 wrapt==1.10.5
 zendesk==1.1.1

From 33273eed4e62642e8a64d570b0664bfbba0ff2d4 Mon Sep 17 00:00:00 2001
From: Eric Fischer <efischer@edx.org>
Date: Wed, 30 Nov 2016 12:48:21 -0500
Subject: [PATCH 2/2] rectify old require.js hackery

---
 cms/static/cms/js/build.js | 3 +--
 lms/static/lms/js/build.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cms/static/cms/js/build.js b/cms/static/cms/js/build.js
index fd90513c2a..e078c90603 100644
--- a/cms/static/cms/js/build.js
+++ b/cms/static/cms/js/build.js
@@ -171,5 +171,4 @@
          */
         logLevel: 1
     };
-}())  // eslint-disable-line semi
-// A semicolon on the line above will break the requirejs optimizer
+}());
diff --git a/lms/static/lms/js/build.js b/lms/static/lms/js/build.js
index a80b35e875..228773ff67 100644
--- a/lms/static/lms/js/build.js
+++ b/lms/static/lms/js/build.js
@@ -165,5 +165,4 @@
          */
         logLevel: 1
     };
-}())  // eslint-disable-line semi
-// A semicolon on the line above will break the requirejs optimizer
+}());