summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-08 04:18:16 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-08 04:18:16 -0700
commit8688789353e1b6c3b4c6ed0eb410797092f1331b (patch)
tree10486313ae2035dee1731875d04a030355b8d0db /Gemfile.lock
parenta87f5c60a4552b8be5f7d5f9de3b4cda20ec648a (diff)
parent439cd3ebd3613825fc426238770f522a9401d51e (diff)
downloadgitlab-ce-8688789353e1b6c3b4c6ed0eb410797092f1331b.tar.gz
Merge pull request #3834 from ichord/gfm-autocomp
improve gfm autocomplete
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3080651ba29..77ff70faa55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -231,7 +231,7 @@ GEM
httpauth (0.2.0)
i18n (0.6.1)
journey (1.0.4)
- jquery-atwho-rails (0.1.7)
+ jquery-atwho-rails (0.3.0)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
@@ -532,7 +532,7 @@ DEPENDENCIES
guard-spinach
haml-rails
httparty
- jquery-atwho-rails (= 0.1.7)
+ jquery-atwho-rails (= 0.3.0)
jquery-rails (= 2.1.3)
jquery-turbolinks
jquery-ui-rails (= 2.0.2)