From 76d6bc4f82b04931a5f4dfc86af8d98c48e33e82 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 9 May 2013 11:02:48 +0300
Subject: [PATCH] Update gitlab_git and restore travis.yml
---
.travis.yml | 2 +-
Gemfile | 4 ++--
Gemfile.lock | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d8e01fd6c68a..d7fbbc7bbcba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_install:
- gem install charlock_holmes -v="0.6.9"
branches:
only:
- - 'code-search'
+ - 'master'
rvm:
- 1.9.3-p392
- 2.0.0
diff --git a/Gemfile b/Gemfile
index 3f8383f308ea..677577012cd3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# We cannot use original git since some bugs
gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git'
-gem 'gitlab_git', '~> 1.0.6'
+gem 'gitlab_git', '~> 1.1.0'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
@@ -155,7 +155,7 @@ group :development, :test do
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest'
-
+
# Generate Fake data
gem "ffaker"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a247127c57b..ad2f6764a9fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -164,7 +164,7 @@ GEM
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
- gitlab_git (1.0.6)
+ gitlab_git (1.1.0)
activesupport (~> 3.2.13)
github-linguist (~> 2.3.4)
grit (~> 2.5.0)
@@ -518,7 +518,7 @@ DEPENDENCIES
github-markup (~> 0.7.4)
gitlab-grack (~> 1.0.0)
gitlab-pygments.rb (~> 0.3.2)
- gitlab_git (~> 1.0.6)
+ gitlab_git (~> 1.1.0)
gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.2)
gollum-lib (~> 1.0.0)
--
GitLab