Download as
Browse Code »

Commit 316dfbaea8b34336691e7f97ad0c94a21b6f7e57

Authored by Dmitriy Zaporozhets
1 parent 2255dc8f
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update pygments version

Showing 2 changed files with 15 additions and 8 deletions   Show diff stats
Gemfile
  Diff comments   View file @316dfba
... ... @@ -2,20 +2,27 @@ source "http://rubygems.org"
2 2  
3 3 gem "rails", "3.2.5"
4 4  
  5 +# Supported DBs
5 6 gem "sqlite3"
6 7 gem "mysql2"
  8 +
  9 +# Auth
7 10 gem "devise", "~> 1.5"
  11 +
  12 +# GITLAB patched libs
  13 +gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
  14 +gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
  15 +gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
  16 +gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
  17 +gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
  18 +
8 19 gem "stamp"
9 20 gem "kaminari"
10 21 gem "haml-rails"
11   -gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
12   -gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
13 22 gem "carrierwave"
14 23 gem "six"
15 24 gem "ffaker"
16 25 gem "seed-fu"
17   -gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
18   -gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git"
19 26 gem "redcarpet", "~> 2.1.1"
20 27 gem "thin"
21 28 gem "unicorn"
... ... @@ -30,7 +37,6 @@ gem "foreman"
30 37 gem "omniauth-ldap"
31 38 gem 'bootstrap-sass', "2.0.3.1"
32 39 gem "colored"
33   -gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
34 40 gem 'resque_mailer'
35 41 gem 'chosen-rails'
36 42  
... ...
Gemfile.lock
  Diff comments   View file @316dfba
... ... @@ -35,9 +35,10 @@ GIT
35 35  
36 36 GIT
37 37 remote: https://github.com/gitlabhq/pygments.rb.git
38   - revision: dfa0d936da40f25e249a7d20f895e6d4cab72b50
  38 + revision: 2cada028da5054616634a1d9ca6941b65b3ce188
  39 + ref: 2cada028da5054616634a1d9ca6941b65b3ce188
39 40 specs:
40   - pygments.rb (0.2.12)
  41 + pygments.rb (0.2.13)
41 42 rubypython (~> 0.6.1)
42 43  
43 44 GIT
... ... @@ -384,7 +385,7 @@ DEPENDENCIES
384 385 mysql2
385 386 omniauth-ldap
386 387 pry
387   - pygments.rb (= 0.2.12)!
  388 + pygments.rb!
388 389 rails (= 3.2.5)
389 390 rails-footnotes
390 391 redcarpet (~> 2.1.1)
... ...