diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css.scss.erb | 2 |
4 files changed, 5 insertions, 14 deletions
@@ -48,8 +48,7 @@ gem 'font-awesome-sass' gem 'will_paginate-bootstrap' gem 'simple_form' gem 'tagmanager-rails', '~> 3.0.1.0' -#gem 'typeahead-rails', '~> 0.10.1' -gem "twitter-typeahead-rails", :git => "https://github.com/ldonnet/twitter-typeahead-rails" +gem 'typeahead-rails', '~> 0.10.5' gem "breadcrumbs_on_rails" gem 'bootstrap-timepicker-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 03309d76a..f010c1b6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,15 +12,6 @@ GIT foreigner (= 1.6.0) georuby-ext (= 0.0.5) -GIT - remote: https://github.com/ldonnet/twitter-typeahead-rails - revision: 97466061dc7999ba1c7d153fba7ced8df846431a - specs: - twitter-typeahead-rails (0.10.2) - actionpack (>= 3.1) - jquery-rails - railties (>= 3.1) - GEM remote: http://rubygems.org/ specs: @@ -351,6 +342,7 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) + typeahead-rails (0.10.5) tzinfo (0.3.40) uglifier (1.2.7) execjs (>= 0.3.0) @@ -439,7 +431,7 @@ DEPENDENCIES tagmanager-rails (~> 3.0.1.0) therubyracer (~> 0.10.2) therubyrhino - twitter-typeahead-rails! + typeahead-rails (~> 0.10.5) uglifier (>= 1.0.3) warbler will_paginate (~> 3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 682945294..f8f6c6d1f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ //= require raphael //= require morris //= require bootstrap -//= require twitter/typeahead.min +//= require typeahead.min //= require bootstrap-timepicker //= require tagmanager //= require_directory ./plugins diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb index 348ab3ef0..8708d53c4 100644 --- a/app/assets/stylesheets/application.css.scss.erb +++ b/app/assets/stylesheets/application.css.scss.erb @@ -25,7 +25,7 @@ $body-bg: #eee; @import "jquery.ui.all"; @import "morris"; @import "formtastic"; -@import "twitter-typeahead-rails"; +@import "typeahead-rails"; @import "bootstrap-timepicker"; @import "vendor/openlayers_style"; |