diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-06-20 14:45:26 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-06-20 14:45:26 +0400 |
| commit | 316dfbaea8b34336691e7f97ad0c94a21b6f7e57 (patch) | |
| tree | 9113a99f0ee5869872b9abaa268e6f216ec3908f | |
| parent | 2255dc8f8d388b6df1919f9fc44ecb9ea55de511 (diff) | |
Update pygments version
| -rw-r--r-- | Gemfile | 16 | ||||
| -rw-r--r-- | Gemfile.lock | 7 |
2 files changed, 15 insertions, 8 deletions
@@ -2,20 +2,27 @@ source "http://rubygems.org" gem "rails", "3.2.5" +# Supported DBs gem "sqlite3" gem "mysql2" + +# Auth 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 "kaminari" 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 "six" gem "ffaker" 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 "thin" gem "unicorn" @@ -30,7 +37,6 @@ gem "foreman" gem "omniauth-ldap" gem 'bootstrap-sass', "2.0.3.1" gem "colored" -gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" gem 'resque_mailer' gem 'chosen-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 1301f96423f..bdf78c46e01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,9 +35,10 @@ GIT GIT remote: https://github.com/gitlabhq/pygments.rb.git - revision: dfa0d936da40f25e249a7d20f895e6d4cab72b50 + revision: 2cada028da5054616634a1d9ca6941b65b3ce188 + ref: 2cada028da5054616634a1d9ca6941b65b3ce188 specs: - pygments.rb (0.2.12) + pygments.rb (0.2.13) rubypython (~> 0.6.1) GIT @@ -384,7 +385,7 @@ DEPENDENCIES mysql2 omniauth-ldap pry - pygments.rb (= 0.2.12)! + pygments.rb! rails (= 3.2.5) rails-footnotes redcarpet (~> 2.1.1) |