kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-12-11 17:30:49 +00:00
commit 7bb2a536a0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -143,7 +143,7 @@ gem 'jquery-turbolinks'
gem 'chosen-rails', "1.0.1" gem 'chosen-rails', "1.0.1"
gem 'select2-rails' 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-rails", "2.1.3"
gem "jquery-ui-rails", "2.0.2" gem "jquery-ui-rails", "2.0.2"
gem "modernizr", "2.6.2" gem "modernizr", "2.6.2"

4
Gemfile.lock
View file

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