Download as
Browse Code »

Commit 7bb2a536a02454bef0f5b9c6def342992128da36

Authored by Dmitriy Zaporozhets
2 parents 0456c666 38fc5dc2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @7bb2a53
... ... @@ -143,7 +143,7 @@ gem 'jquery-turbolinks'
143 143  
144 144 gem 'chosen-rails', "1.0.1"
145 145 gem 'select2-rails'
146   -gem 'jquery-atwho-rails', "~> 0.4.1"
  146 +gem 'jquery-atwho-rails', "~> 0.3.3"
147 147 gem "jquery-rails", "2.1.3"
148 148 gem "jquery-ui-rails", "2.0.2"
149 149 gem "modernizr", "2.6.2"
... ...
Gemfile.lock
  Diff comments   View file @7bb2a53
... ... @@ -257,7 +257,7 @@ GEM
257 257 rack (>= 1.2.1)
258 258 rake
259 259 jasmine-core (2.0.0.rc5)
260   - jquery-atwho-rails (0.4.1)
  260 + jquery-atwho-rails (0.3.3)
261 261 jquery-rails (2.1.3)
262 262 railties (>= 3.1.0, < 5.0)
263 263 thor (~> 0.14)
... ... @@ -605,7 +605,7 @@ DEPENDENCIES
605 605 hipchat (~> 0.9.0)
606 606 httparty
607 607 jasmine (= 2.0.0.rc5)
608   - jquery-atwho-rails (~> 0.4.1)
  608 + jquery-atwho-rails (~> 0.3.3)
609 609 jquery-rails (= 2.1.3)
610 610 jquery-turbolinks
611 611 jquery-ui-rails (= 2.0.2)
... ...