diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 22:20:28 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 22:20:28 -0400 |
| commit | bf798e57a760b68c3c7460789cef6389141c067d (patch) | |
| tree | 16cd7400b7f289b4aa6ec90e253c4d30d7a1a08c /Gemfile.lock | |
| parent | 91fee659eadaf6bcc4d063fd5645950da1250896 (diff) | |
| parent | 628173fce3de8f5d3e31109b3aa7c964fdab38ca (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0de5c48..b894f81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,6 +45,9 @@ GEM debugger-linecache (1.2.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) @@ -134,7 +137,7 @@ DEPENDENCIES bootstrap-sass byebug coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails |