Permalink
Browse files

Merge pull request #1463 from chrisccerami/update_jquery

Update jQuery from 1.3.2 to 1.12.4
  • Loading branch information...
2 parents 9b35755 + c12723c commit 105a54017fe2eb12cb09fa3241afce06581cf586 @chrisccerami chrisccerami committed May 28, 2016
Showing with 2 additions and 2 deletions.
  1. +1 −1 HISTORY.md
  2. +1 −1 lib/resque/server/views/layout.erb
View
@@ -1,6 +1,6 @@
## 1.27.0 (TBD)
-None yet!
+* Update jQuery from 1.3.2 to 1.12.4
* Fix issue where calling Worker.find, Worker.all, or Worker.working from withing
a running job would rewrite the PID file with the PID of the forked worker.
@@ -5,7 +5,7 @@
<title>Resque</title>
<link href="<%=u 'reset.css' %>" media="screen" rel="stylesheet" type="text/css">
<link href="<%=u 'style.css' %>" media="screen" rel="stylesheet" type="text/css">
- <script src="<%=u 'jquery-1.3.2.min.js' %>" type="text/javascript"></script>
+ <script src="<%=u 'jquery-1.12.4.min.js' %>" type="text/javascript"></script>
<script src="<%=u 'jquery.relatize_date.js' %>" type="text/javascript"></script>
<script src="<%=u 'ranger.js' %>" type="text/javascript"></script>
</head>

0 comments on commit 105a540

Please sign in to comment.