diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 19:00:21 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 19:00:21 -0400 |
| commit | 5c6d6dca48bf3d54f145e859e6d4c8b1befe1f09 (patch) | |
| tree | caeace01060fc7825c62db009d1886cab2b79f9b /Gemfile.lock | |
| parent | 7bb14aca1a6881e37c4bc6c1bd89fc2f126386db (diff) | |
| parent | e44115cf206804f7a22c5f98ba422d9c61ad81a7 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e0d013b..2fc2fe5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,6 +31,11 @@ GEM bootstrap-sass (3.1.1.0) sass (~> 3.2) builder (3.1.4) + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -46,6 +51,8 @@ GEM delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) + foreigner (1.6.1) + activerecord (>= 3.0.0) hike (1.2.3) httparty (0.13.0) json (~> 1.8) @@ -62,6 +69,10 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) + mailboxer (0.11.0) + carrierwave (>= 0.5.8) + foreigner (>= 0.9.1) + rails (> 3.0.0) mime-types (1.25.1) minitest (4.7.5) multi_json (1.9.2) @@ -137,6 +148,7 @@ DEPENDENCIES httparty jbuilder (~> 1.2) jquery-rails + mailboxer rails (= 4.0.2) sass-rails (~> 4.0.0) sdoc |