diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 22:05:17 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 22:05:17 -0400 |
| commit | aa7f5b6daa1012023f34c53f7772ca5567824e94 (patch) | |
| tree | 4157fe9de1e84fc4cc9d5f7c5785a329d4ad5369 /Gemfile.lock | |
| parent | dd46c4b23640b0719e16e874b8f593e159b54a3c (diff) | |
| parent | 5084f01e0ea7ba7c378982099fdbf9880857f091 (diff) | |
Merge branch 'master' of https://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 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 |