diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-06-20 02:35:02 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-06-20 02:35:02 -0700 |
| commit | 2255dc8f8d388b6df1919f9fc44ecb9ea55de511 (patch) | |
| tree | 3dc6418f00ebcb94dd11e387d6eee28277bc1cd8 | |
| parent | 3ca6c960ce39611de215fa2aa1497508de537218 (diff) | |
| parent | 13e7ef4b7d89ab2d2468d2930aa29294395ba451 (diff) | |
| download | gitlab-ce-2255dc8f8d388b6df1919f9fc44ecb9ea55de511.tar.gz | |
Merge pull request #947 from netdata/Update_gemfile_for_latest_grit
Update to the latest grit
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -8,7 +8,7 @@ gem "devise", "~> 1.5" gem "stamp" gem "kaminari" gem "haml-rails" -gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "9536f306645f2d6b1f993ae02d3a29893ba8881f" +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" diff --git a/Gemfile.lock b/Gemfile.lock index 26bc2e25f8a..1301f96423f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,8 +15,8 @@ GIT GIT remote: https://github.com/gitlabhq/grit.git - revision: 9536f306645f2d6b1f993ae02d3a29893ba8881f - ref: 9536f306645f2d6b1f993ae02d3a29893ba8881f + revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837 + ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837 specs: grit (2.5.0) diff-lcs (~> 1.1) |