diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 033631a1c..f31ac8296 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,7 @@ GIT GEM remote: http://rubygems.org/ + remote: https://rails-assets.org/ specs: RedCloth (4.2.9) RedCloth (4.2.9-java) @@ -63,12 +64,8 @@ GEM arel (3.0.3) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) - bootstrap-sass (3.1.1.1) - sass (~> 3.2) bootstrap-timepicker-rails (0.1.3) railties (>= 3.0) - bootswatch-rails (3.1.1.1) - railties (>= 3.1) bouncy-castle-java (1.5.0146.1) breadcrumbs_on_rails (2.3.0) builder (3.0.4) @@ -243,6 +240,17 @@ GEM activesupport (= 3.2.18) bundler (~> 1.0) railties (= 3.2.18) + rails-assets-bootstrap (3.1.1) + rails-assets-jquery (>= 1.9.0) + rails-assets-bootstrap-sass-official (3.1.1.2) + rails-assets-jquery (2.1.1) + rails-assets-tagmanager (3.0.1) + rails-assets-jquery (>= 1.0.0) + rails-assets-typeahead.js (0.10.5) + rails-assets-jquery (>= 1.7) + rails-assets-typeahead.js-bootstrap3.less (0.2.3) + rails-assets-bootstrap (~> 3.1.0) + rails-assets-typeahead.js (~> 0.10.0) rails-erd (1.1.0) activerecord (>= 3.0) activesupport (>= 3.0) @@ -330,8 +338,6 @@ GEM activerecord (~> 3.0) activesupport (~> 3.0) polyamorous (~> 0.5.0) - tagmanager-rails (3.0.1.0) - railties (>= 3.0, < 5.0) therubyracer (0.10.2) libv8 (~> 3.3.10) therubyrhino (2.0.1) @@ -342,7 +348,6 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - typeahead-rails (0.10.5) tzinfo (0.3.41) uglifier (1.2.7) execjs (>= 0.3.0) @@ -372,9 +377,7 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter (~> 1.3.3) acts_as_list (= 0.1.6) acts_as_tree-1.8 (= 1.1.0) - bootstrap-sass (~> 3.1.1) bootstrap-timepicker-rails - bootswatch-rails breadcrumbs_on_rails calendar_helper (= 0.2.5) capistrano @@ -413,6 +416,10 @@ DEPENDENCIES pg (~> 0.11.0) rabl rails (= 3.2.18) + rails-assets-bootstrap-sass-official (~> 3.1.1) + rails-assets-tagmanager (~> 3.0.1.0) + rails-assets-typeahead.js (~> 0.10.5) + rails-assets-typeahead.js-bootstrap3.less rails-erd ransack raphael-rails @@ -428,10 +435,8 @@ DEPENDENCIES simple_form sqlite3 squeel - tagmanager-rails (~> 3.0.1.0) therubyracer (~> 0.10.2) therubyrhino - typeahead-rails (~> 0.10.5) uglifier (>= 1.0.3) warbler will_paginate (~> 3.0) |