diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-06 19:55:33 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-06 19:55:33 -0400 |
| commit | d1bdf1ea4e3120c133cc5e81970958355a9719a1 (patch) | |
| tree | db0ba12aa8f96e5b4ed60494925cbe8fd6a93f5d | |
| parent | d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (diff) | |
pull changes to Gemfile from master
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -48,7 +48,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks -gem 'delayed_job' +gem 'delayed_job_active_record' group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 51e29e7..fd03576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,9 @@ GEM coffee-script-source (1.7.0) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) + delayed_job_active_record (4.0.0) + activerecord (>= 3.0, < 4.1) + delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -128,7 +131,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails |