Prepare for release 2.1.0 (#1758)

* update HISTORY.md for 2.1.0 release

* More specific and correct info on including changes to HISTORY.md in PR

* Steve Klabnick's 2015 post is no longer necessarily accurate description of state of resque

* VERSION constant for 2.1.0 release

* Remove reference to 2015 klabnick post, it's not currently useful info.

Per @chrisccerami #1758 (comment)

Co-authored-by: Michael Bianco <iloveitaly@gmail.com>

CONTRIBUTING.md

@@ -12,15 +12,12 @@ The main way to contribute to Resque is to write some code! Here's how:
    branch
 5. That's it!
 
-If you're not doing some sort of refactoring, a CHANGELOG entry is appropriate.
-Please include them in pull requests adding features or fixing bugs.
+An entry in the `HISTORY.md` is appropriate for changes that aren't of purely
+internal consequences. Please include a modification of HISTORY.md adding a
+bullet for your change in your pull request where relevant.
 
 Oh, and 80 character columns, please!
 
-For more information, see
-Steve Klabnik's post here about the direction and current state of Resque:
-[Rescuing Resque...again](http://words.steveklabnik.com/rescuing-resque-again)
-
 Tests
 -----
 

HISTORY.md

@@ -1,6 +1,28 @@
 ## Unreleased
 
 ### Added
+
+*
+*
+
+### Fixed
+
+*
+*
+
+## 2.1.0
+
+### Security
+
+* Fix XSS via URL path in admin web UI queues view #1687
+* Replace onclick handlers in server code to support Content Security Policies that don't allow 'unsafe-inline'
+* Update jQuery from 1.12.4 to 3.6.0
+
+### Added
+
+* Add requeue_queue method to Resque::Failure::Multiple #1659
+* Confirmation prompt in admin front-end before submitting the retry of all failed jobs. #1753
+* Railtie for default rake task setup when in Rails. #1715
 * Added two new hooks.
   - `queue_empty` when the job queue empties and the worker becomes idle
   - `worker_exit` when the worker exits
@@ -9,12 +31,11 @@
   further details. (@jeremywadsack)
 
 ### Fixed
-* Prune workers which haven't been registered but have set a heartbeat
-* `Resque::Failure::Multiple.remove` did not pass on the queue parameter
-* Replace onclick handlers in server code to support Content Security Policies that don't allow 'unsafe-inline'
 
-### Changed
-* Update jQuery from 1.12.4 to 3.6.0
+* live poller shouldn't restart itself until it successds or fails. #1740
+* Fix parsing worker_id when queue name includes colon. #1691
+* Prune workers which haven't been registered but have set a heartbeat. #1751
+* `Resque::Failure::Multiple.remove` did not pass on the queue parameter
 
 ## 2.0.0 (2018-11-06)
 

lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '2.0.0'
+  Version = VERSION = '2.1.0'
 end