diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-06-28 16:18:15 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-06-28 16:21:20 -0700 |
| commit | e5661001d667313d6ce56886d10c2a7ae313fe0f (patch) | |
| tree | cb8a28ba79251a9be702e2e4ddec8f73986b66c3 | |
| parent | 9f166a864959370d3e31931519506887b902cd11 (diff) | |
| download | gitlab-ce-e5661001d667313d6ce56886d10c2a7ae313fe0f.tar.gz | |
Bump rugments to v1.0.0beta8 to fix C prototype function highlighting
Closes #1890
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3971b924277..8bfcf75d6b0 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) @@ -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 8d09fe9bf88..23ca05c4e8f 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 |