Commit c0c5d94b2bf605149a1d4d56d2adc7dd102b290a
Exists in
master
and in
4 other branches
Merge pull request #2177 from riyad/update-pygments.rb
Update pygments.rb
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
Gemfile
@@ -32,7 +32,7 @@ gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: | @@ -32,7 +32,7 @@ gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: | ||
32 | gem "gitolite", '1.1.0' | 32 | gem "gitolite", '1.1.0' |
33 | 33 | ||
34 | # Syntax highlighter | 34 | # Syntax highlighter |
35 | -gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", ref: '4db80c599067e2d5f23c5c243bf85b8ca0368ad4' | 35 | +gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: "master" |
36 | 36 | ||
37 | # Language detection | 37 | # Language detection |
38 | gem "github-linguist", "~> 2.3.4" , require: "linguist" | 38 | gem "github-linguist", "~> 2.3.4" , require: "linguist" |
Gemfile.lock
@@ -45,8 +45,8 @@ GIT | @@ -45,8 +45,8 @@ GIT | ||
45 | 45 | ||
46 | GIT | 46 | GIT |
47 | remote: https://github.com/gitlabhq/pygments.rb.git | 47 | remote: https://github.com/gitlabhq/pygments.rb.git |
48 | - revision: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4 | ||
49 | - ref: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4 | 48 | + revision: db1da0343adf86b49bdc3add04d02d2e80438d38 |
49 | + branch: master | ||
50 | specs: | 50 | specs: |
51 | pygments.rb (0.3.2) | 51 | pygments.rb (0.3.2) |
52 | posix-spawn (~> 0.3.6) | 52 | posix-spawn (~> 0.3.6) |