Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhq

Gemfile

@@ -143,7 +143,7 @@ gem 'jquery-turbolinks'
 
 gem 'chosen-rails',     "1.0.1"
 gem 'select2-rails'
-gem 'jquery-atwho-rails', "~> 0.4.1"
+gem 'jquery-atwho-rails', "~> 0.3.3"
 gem "jquery-rails",     "2.1.3"
 gem "jquery-ui-rails",  "2.0.2"
 gem "modernizr",        "2.6.2"

Gemfile.lock

@@ -257,7 +257,7 @@ GEM
       rack (>= 1.2.1)
       rake
     jasmine-core (2.0.0.rc5)
-    jquery-atwho-rails (0.4.1)
+    jquery-atwho-rails (0.3.3)
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
@@ -605,7 +605,7 @@ DEPENDENCIES
   hipchat (~> 0.9.0)
   httparty
   jasmine (= 2.0.0.rc5)
-  jquery-atwho-rails (~> 0.4.1)
+  jquery-atwho-rails (~> 0.3.3)
   jquery-rails (= 2.1.3)
   jquery-turbolinks
   jquery-ui-rails (= 2.0.2)