Commit 75f95fae authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Update typeahead.js, use the version from rails-assets.org 

closes #7192
parent 00ed1c9b

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
* Reduce i18n.load side effects [#7184](https://github.com/diaspora/diaspora/pull/7184)

* Force jasmine fails on syntax errors [#7185](https://github.com/diaspora/diaspora/pull/7185)

* Don't display mail-related view content if it is disabled in the pod's config [#7190](https://github.com/diaspora/diaspora/pull/7190)

* Use typeahead.js from rails-assets.org [#7192](https://github.com/diaspora/diaspora/pull/7192)



## Bug fixes

* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)

Gemfile

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ source "https://rails-assets.org" do 
  gem "rails-assets-markdown-it-sup",                     "1.0.0"

  gem "rails-assets-highlightjs",                         "9.7.0"

  gem "rails-assets-bootstrap-markdown",                  "2.10.0"

  gem "rails-assets-corejs-typeahead",                    "1.0.1"



  # jQuery plugins

Gemfile.lock

+3 −0
Original line number Diff line number Diff line
@@ -646,6 +646,8 @@ GEM 
      rails-assets-jquery (>= 1.9.1, < 4)

    rails-assets-bootstrap-markdown (2.10.0)

      rails-assets-bootstrap (~> 3)

    rails-assets-corejs-typeahead (1.0.1)

      rails-assets-jquery (>= 1.7)

    rails-assets-diaspora_jsxc (0.1.5.develop.7)

      rails-assets-emojione (~> 2.0.1)

      rails-assets-favico.js (>= 0.3.10, < 0.4)
@@ -997,6 +999,7 @@ DEPENDENCIES 
  rails-assets-autosize (= 3.0.17)!

  rails-assets-blueimp-gallery (= 2.21.3)!

  rails-assets-bootstrap-markdown (= 2.10.0)!

  rails-assets-corejs-typeahead (= 1.0.1)!

  rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!

  rails-assets-highlightjs (= 9.7.0)!

  rails-assets-jasmine-ajax (= 3.2.0)!

app/assets/javascripts/main.js

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
//= require markdown-it-sup

//= require highlightjs

//= require clear-form

//= require typeahead.bundle.js

//= require corejs-typeahead

//= require app/app

//= require diaspora

//= require_tree ./helpers

vendor/assets/javascripts/typeahead.bundle.js

deleted100644 → 0
+0 −2469

File deleted.

Preview size limit exceeded, changes collapsed.