diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 617a8cc82..f768b3d6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,6 @@ GEM arel (3.0.3) bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) - bootstrap-timepicker-rails (0.1.3) - railties (>= 3.0) bouncy-castle-java (1.5.0146.1) breadcrumbs_on_rails (2.3.0) builder (3.0.4) @@ -243,7 +241,12 @@ GEM rails-assets-bootstrap (3.1.1) rails-assets-jquery (>= 1.9.0) rails-assets-bootstrap-sass-official (3.1.1.2) + rails-assets-eonasdan-bootstrap-datetimepicker (3.1.3) + rails-assets-bootstrap (>= 3.0) + rails-assets-jquery (>= 1.8.3) + rails-assets-moment (>= 2.8.0) rails-assets-jquery (2.1.1) + rails-assets-moment (2.8.3) rails-assets-respond (1.4.2) rails-assets-tagmanager (3.0.1) rails-assets-jquery (>= 1.0.0) @@ -379,7 +382,6 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter (~> 1.3.3) acts_as_list (= 0.1.6) acts_as_tree-1.8 (= 1.1.0) - bootstrap-timepicker-rails breadcrumbs_on_rails calendar_helper (= 0.2.5) capistrano @@ -419,6 +421,7 @@ DEPENDENCIES rabl rails (= 3.2.18) rails-assets-bootstrap-sass-official (~> 3.1.1) + rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3) rails-assets-respond rails-assets-tagmanager (~> 3.0.1.0) rails-assets-typeahead.js (~> 0.10.5) |