diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-06-30 05:32:56 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-06-30 05:32:56 +0000 |
| commit | e489b07d2bc70654728b2c6be903cd8adf090176 (patch) | |
| tree | 9bde481ad3bdcc48b7b571c85d0d9657514b2bde | |
| parent | 1161c93661f4630185289844965fb701df902642 (diff) | |
| parent | e5661001d667313d6ce56886d10c2a7ae313fe0f (diff) | |
| download | gitlab-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
| -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 4ee5a950d99..22207eabc59 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) - Fix order of issues imported form GitHub (Hiroyuki Sato) + - 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) @@ -268,4 +268,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 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 |