Merge branch 'master' into pr/10951

Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less

1 files changed, 7 insertions, 7 deletions

diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 98b10059e..5e39bbab6 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -1,22 +1,22 @@
 $(function () {
 
-    module("alert")
+    module('alert')
 
-      test("should provide no conflict", function () {
+      test('should provide no conflict', function () {
         var alert = $.fn.alert.noConflict()
         ok(!$.fn.alert, 'alert was set back to undefined (org value)')
         $.fn.alert = alert
       })
 
-      test("should be defined on jquery object", function () {
+      test('should be defined on jquery object', function () {
         ok($(document.body).alert, 'alert method is defined')
       })
 
-      test("should return element", function () {
+      test('should return element', function () {
         ok($(document.body).alert()[0] == document.body, 'document.body returned')
       })
 
-      test("should fade element out on clicking .close", function () {
+      test('should fade element out on clicking .close', function () {
         var alertHTML = '<div class="alert-message warning fade in">'
           + '<a class="close" href="#" data-dismiss="alert">×</a>'
           + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
@@ -28,7 +28,7 @@ $(function () {
         ok(!alert.hasClass('in'), 'remove .in class on .close click')
       })
 
-      test("should remove element when clicking .close", function () {
+      test('should remove element when clicking .close', function () {
         $.support.transition = false
 
         var alertHTML = '<div class="alert-message warning fade in">'
@@ -44,7 +44,7 @@ $(function () {
         ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom')
       })
 
-      test("should not fire closed when close is prevented", function () {
+      test('should not fire closed when close is prevented', function () {
         $.support.transition = false
         stop();
         $('<div class="alert"/>')