Commit 316dfbae authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Update pygments version

parent 2255dc8f
...@@ -2,20 +2,27 @@ source "http://rubygems.org" ...@@ -2,20 +2,27 @@ source "http://rubygems.org"
gem "rails", "3.2.5" gem "rails", "3.2.5"
# Supported DBs
gem "sqlite3" gem "sqlite3"
gem "mysql2" gem "mysql2"
# Auth
gem "devise", "~> 1.5" gem "devise", "~> 1.5"
# GITLAB patched libs
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
gem "stamp" gem "stamp"
gem "kaminari" gem "kaminari"
gem "haml-rails" gem "haml-rails"
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
gem "carrierwave" gem "carrierwave"
gem "six" gem "six"
gem "ffaker" gem "ffaker"
gem "seed-fu" gem "seed-fu"
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
gem "pygments.rb", "0.2.12", :git => "https://github.com/gitlabhq/pygments.rb.git"
gem "redcarpet", "~> 2.1.1" gem "redcarpet", "~> 2.1.1"
gem "thin" gem "thin"
gem "unicorn" gem "unicorn"
...@@ -30,7 +37,6 @@ gem "foreman" ...@@ -30,7 +37,6 @@ gem "foreman"
gem "omniauth-ldap" gem "omniauth-ldap"
gem 'bootstrap-sass', "2.0.3.1" gem 'bootstrap-sass', "2.0.3.1"
gem "colored" gem "colored"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem 'resque_mailer' gem 'resque_mailer'
gem 'chosen-rails' gem 'chosen-rails'
......
...@@ -35,9 +35,10 @@ GIT ...@@ -35,9 +35,10 @@ GIT
GIT GIT
remote: https://github.com/gitlabhq/pygments.rb.git remote: https://github.com/gitlabhq/pygments.rb.git
revision: dfa0d936da40f25e249a7d20f895e6d4cab72b50 revision: 2cada028da5054616634a1d9ca6941b65b3ce188
ref: 2cada028da5054616634a1d9ca6941b65b3ce188
specs: specs:
pygments.rb (0.2.12) pygments.rb (0.2.13)
rubypython (~> 0.6.1) rubypython (~> 0.6.1)
GIT GIT
...@@ -384,7 +385,7 @@ DEPENDENCIES ...@@ -384,7 +385,7 @@ DEPENDENCIES
mysql2 mysql2
omniauth-ldap omniauth-ldap
pry pry
pygments.rb (= 0.2.12)! pygments.rb!
rails (= 3.2.5) rails (= 3.2.5)
rails-footnotes rails-footnotes
redcarpet (~> 2.1.1) redcarpet (~> 2.1.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment