diff options
| author | Jeremy Anderson <jeremy@code-adept.com> | 2012-07-28 06:18:04 +0400 |
|---|---|---|
| committer | Jeremy Anderson <jeremy@code-adept.com> | 2012-07-28 06:18:04 +0400 |
| commit | e6edaa3b502090f461b58c439ea476da2d37f039 (patch) | |
| tree | a9cd55849df039f524ff2b5cbce55c38e9768e04 /Gemfile | |
| parent | 0301ba3315436a2dc466415ab0a3dd4fd7be3931 (diff) | |
| parent | 3caf0aa89a964b8b3dcd21536e5bc274165ed2a2 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,7 +14,7 @@ gem "devise", "~> 2.1.0" 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 "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "7edf27d0281e09561838122982c16b7e62181f44" +gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e" gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" gem 'grack', :git => "https://github.com/gitlabhq/grack.git" gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" |