diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-05 02:45:22 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-05 02:45:22 -0800 |
| commit | c0c5d94b2bf605149a1d4d56d2adc7dd102b290a (patch) | |
| tree | ce2d0f111bb3ff17bc3a6fdfcdb522990eefed12 | |
| parent | 005f2eb9f053cd3c3b13e9d9af7332202e406f12 (diff) | |
| parent | 2519fd8376ba3ecf674bade735fbd4d31238f01c (diff) | |
| download | gitlab-ce-c0c5d94b2bf605149a1d4d56d2adc7dd102b290a.tar.gz | |
Merge pull request #2177 from riyad/update-pygments.rb
Update pygments.rb
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -32,7 +32,7 @@ gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: gem "gitolite", '1.1.0' # Syntax highlighter -gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", ref: '4db80c599067e2d5f23c5c243bf85b8ca0368ad4' +gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: "master" # Language detection gem "github-linguist", "~> 2.3.4" , require: "linguist" diff --git a/Gemfile.lock b/Gemfile.lock index 8242c3c703a..b4eced37182 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,8 +45,8 @@ GIT GIT remote: https://github.com/gitlabhq/pygments.rb.git - revision: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4 - ref: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4 + revision: db1da0343adf86b49bdc3add04d02d2e80438d38 + branch: master specs: pygments.rb (0.3.2) posix-spawn (~> 0.3.6) |