diff --git a/Gemfile b/Gemfile index c6d969cb0..2f5e6ed0f 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "cancancan", "~> 2.3.0" gem "caxlsx", "~> 3.0.2" gem "caxlsx_rails", "~> 0.6.2" gem "ckeditor", "~> 4.3.0" -gem "cocoon", "~> 1.2.14" +gem "cocoon", "~> 1.2.15" gem "daemons", "~> 1.3.1" gem "dalli", "~> 2.7.6" gem "delayed_job_active_record", "~> 4.1.4" diff --git a/Gemfile.lock b/Gemfile.lock index 6431d0bf6..3022f4b10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,7 +146,7 @@ GEM orm_adapter (~> 0.5.0) terrapin climate_control (0.2.0) - cocoon (1.2.14) + cocoon (1.2.15) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -650,7 +650,7 @@ DEPENDENCIES caxlsx (~> 3.0.2) caxlsx_rails (~> 0.6.2) ckeditor (~> 4.3.0) - cocoon (~> 1.2.14) + cocoon (~> 1.2.15) coveralls (~> 0.8.23) daemons (~> 1.3.1) dalli (~> 2.7.6)