diff --git a/CHANGELOG b/CHANGELOG index 3971b924277610527b33ac6095506767b702e9d2..8bfcf75d6b05764eaa0b0f7d4ed19abacccdc29e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) + - Bump rugments to 1.0.0beta8 to fix C prototype function highlighting (Jonathon Reinhart) - Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI - Add `two_factor_enabled` field to admin user API (Stan Hu) - Fix invalid timestamps in RSS feeds (Rowan Wookey) diff --git a/Gemfile b/Gemfile index bda2fac1eeca3be83213f629acce55df2872fcff..f3784acebf258d9f8c4fc19c970afbbab7dbb189 100644 --- a/Gemfile +++ b/Gemfile @@ -267,4 +267,4 @@ end gem "newrelic_rpm" gem 'octokit', '3.7.0' -gem "rugments", "~> 1.0.0.beta7" +gem "rugments", "~> 1.0.0.beta8" diff --git a/Gemfile.lock b/Gemfile.lock index 8d09fe9bf8892b781a8c50f3f896ed686af82349..23ca05c4e8f4e9a13035b2724395ab972eaaf703 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -565,7 +565,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) @@ -821,7 +821,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