diff --git a/Gemfile b/Gemfile index 1ad765e4085cff849d186b6eff664ae26e593bf4..3d6eeb46df83652caef4a40ccbd1e5d274c8054a 100644 --- a/Gemfile +++ b/Gemfile @@ -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 26bc2e25f8a4a56715f8ed0c9a6b6ef759da2694..1301f96423f27f65a0d9aa005fea6062bed1c76d 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)