install jquery-atwho-rails

4 files changed, 5 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 8e569c5b2e5..3024d92c3cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,6 +96,7 @@ group :assets do
   gem "therubyracer"
 
   gem 'chosen-rails'
+  gem 'jquery-atwho-rails', '0.1.6'
   gem "jquery-rails",     "2.0.2"
   gem "jquery-ui-rails",  "0.5.0"
   gem "modernizr",        "2.5.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d27d3fbe81..e517bb36f2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,6 +199,7 @@ GEM
     httpauth (0.1)
     i18n (0.6.1)
     journey (1.0.4)
+    jquery-atwho-rails (0.1.6)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
@@ -440,6 +441,7 @@ DEPENDENCIES
   haml-rails
   headless
   httparty
+  jquery-atwho-rails (= 0.1.6)
   jquery-rails (= 2.0.2)
   jquery-ui-rails (= 0.5.0)
   kaminari
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f9fdb0f7dc2..02ef6caba38 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,6 +11,7 @@
 //= require jquery.endless-scroll
 //= require jquery.highlight
 //= require jquery.waitforimages
+//= require jquery.atwho
 //= require bootstrap
 //= require modernizr
 //= require chosen-jquery
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 92d542a9866..424ba71f7cb 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -4,6 +4,7 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require jquery.ui.all
  *= require jquery.ui.aristo
+ *= require jquery.atwho
  *= require chosen
  *= require_self
  *= require main