summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-06-30 05:32:56 +0000
committerStan Hu <stanhu@gmail.com>2015-06-30 05:32:56 +0000
commite489b07d2bc70654728b2c6be903cd8adf090176 (patch)
tree9bde481ad3bdcc48b7b571c85d0d9657514b2bde /Gemfile.lock
parent1161c93661f4630185289844965fb701df902642 (diff)
parente5661001d667313d6ce56886d10c2a7ae313fe0f (diff)
downloadgitlab-ce-e489b07d2bc70654728b2c6be903cd8adf090176.tar.gz
Merge branch 'fix-c-prototype-highlighting' into 'master'
Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902
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 ad780647a1c..6d39e3b94c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -572,7 +572,7 @@ GEM
rubyntlm (0.5.0)
rubypants (0.2.0)
rugged (0.22.2)
- rugments (1.0.0.beta7)
+ rugments (1.0.0.beta8)
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
@@ -829,7 +829,7 @@ DEPENDENCIES
rqrcode-rails3
rspec-rails (~> 3.3.0)
rubocop (= 0.28.0)
- rugments (~> 1.0.0.beta7)
+ rugments (~> 1.0.0.beta8)
sanitize (~> 2.0)
sass-rails (~> 4.0.2)
sdoc