diff --git a/Gemfile b/Gemfile index e6184d67f9..b8391a64d3 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ group :assets do gem 'turbo-sprockets-rails3' gem 'foundation-icons-sass-rails' gem 'momentjs-rails' - gem 'angular-rails-templates', '~> 0.2.0' + gem 'angular-rails-templates', '~> 0.3.0' end gem "foundation-rails" diff --git a/Gemfile.lock b/Gemfile.lock index e5cba5fc88..47176418be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,9 +177,9 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) andand (1.3.3) - angular-rails-templates (0.2.0) + angular-rails-templates (0.3.0) railties (>= 3.1) - sprockets (~> 2) + sprockets (~> 2.0) tilt angularjs-file-upload-rails (1.1.6) angularjs-rails (1.5.5) @@ -483,7 +483,7 @@ GEM railties (>= 3.1) money (5.1.0) i18n (~> 0.6.0) - multi_json (1.12.1) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) nenv (0.3.0) @@ -538,7 +538,7 @@ GEM activesupport (>= 2.3.14) multi_json (~> 1.0) rack (1.4.7) - rack-cache (1.7.1) + rack-cache (1.8.0) rack (>= 0.4) rack-livereload (0.3.17) rack @@ -567,7 +567,7 @@ GEM thor (>= 0.14.6, < 2.0) rainbow (3.0.0) raindrops (0.13.0) - rake (10.5.0) + rake (12.3.1) ransack (0.7.2) actionpack (~> 3.0) activerecord (~> 3.0) @@ -714,7 +714,7 @@ DEPENDENCIES activemerchant (~> 1.78) acts-as-taggable-on (~> 3.4) andand - angular-rails-templates (~> 0.2.0) + angular-rails-templates (~> 0.3.0) angularjs-file-upload-rails (~> 1.1.6) angularjs-rails (= 1.5.5) atomic