From 41d04ae56b59b39ec64f00bb3c76ad8a50a99429 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 7 Oct 2014 20:28:05 +0600 Subject: [PATCH] Revert "update grit" This reverts commit 134dac6083abd6ac52ddbc132289c014eb02e14d. --- Gemfile | 2 +- Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8fe7b8cf2..294899a11 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'state_machine', '~> 1.2' gem 'redis-rails', '~> 4.0' gem 'grack', git: 'git://github.com/rosa-abf/grack.git', require: 'git_http' -gem 'grit', git: 'git://github.com/rosa-abf/grit.git', tag: '2.6.15' +gem 'grit', git: 'git://github.com/rosa-abf/grit.git' gem 'charlock_holmes', '~> 0.7' gem 'github-linguist', '~> 3.1', require: 'linguist' gem 'diff-display', '~> 0.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index a7c9b7e22..f17180b7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,8 +40,7 @@ GIT GIT remote: git://github.com/rosa-abf/grit.git - revision: 8abd65c0d24796cd6f3673588a430d46777a8670 - tag: 2.6.15 + revision: 87e7cc875de5fd1c3e446d1fd0f533a95d10bb2d specs: grit (2.5.0) diff-lcs (~> 1.1)