From d7ad2b04a58886df6832309fcbd5ba031896ba30 Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Wed, 21 Mar 2018 11:03:19 -0400 Subject: [PATCH] Made Gemfile stop using fork of jquery-textcomplete-rails. --- Gemfile | 2 +- Gemfile.lock | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 6c72880..09f297d 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'rest-client' gem 'activerecord-session_store' gem 'highlight_js-rails', github: 'RedstonerServer/highlight_js-rails' gem 'kaminari', github: 'jomo/kaminari', branch: 'patch-2' # pagination -gem 'jquery-textcomplete-rails', github: 'RedstonerServer/jquery-textcomplete-rails' # @mentions +gem 'jquery-textcomplete-rails' # @mentions gem 'actionpack-action_caching', github: 'antulik/actionpack-action_caching', ref: '8c6e52c69315d67437f480da5dce4b7c8737fb32' gem 'mail-gpg', github: 'jomo/mail-gpg', ref: 'a666b48ee866dfa3eaa700f9c5edf4d195d0f8c9' diff --git a/Gemfile.lock b/Gemfile.lock index 31b294e..bb55637 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,15 +5,6 @@ GIT highlight_js-rails (8.4) rails (>= 3.1.1) -GIT - remote: git://github.com/RedstonerServer/jquery-textcomplete-rails.git - revision: 8bf23af2d8fa1c5226c2b6889c7796adfe1f8772 - specs: - jquery-textcomplete-rails (0.1.4) - coffee-rails (>= 3.2.0) - railties (>= 3.2.0) - sass-rails (>= 3.2.0) - GIT remote: git://github.com/antulik/actionpack-action_caching.git revision: 8c6e52c69315d67437f480da5dce4b7c8737fb32 @@ -161,6 +152,10 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jquery-textcomplete-rails (0.1.5) + coffee-rails (>= 3.2.0) + railties (>= 3.2.0) + sass-rails (>= 3.2.0) kgio (2.11.2) loofah (2.2.1) crass (~> 1.0.2) @@ -269,7 +264,7 @@ DEPENDENCIES highlight_js-rails! hirb jquery-rails - jquery-textcomplete-rails! + jquery-textcomplete-rails kaminari! mail-gpg! mysql2