Download as
Browse Code »

Commit 76d6bc4f82b04931a5f4dfc86af8d98c48e33e82

Authored by Dmitriy Zaporozhets
1 parent ad947bc7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update gitlab_git and restore travis.yml

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
.travis.yml
  Diff comments   View file @76d6bc4
... ... @@ -6,7 +6,7 @@ before_install:
6 6 - gem install charlock_holmes -v="0.6.9"
7 7 branches:
8 8 only:
9   - - 'code-search'
  9 + - 'master'
10 10 rvm:
11 11 - 1.9.3-p392
12 12 - 2.0.0
... ...
Gemfile
  Diff comments   View file @76d6bc4
... ... @@ -24,7 +24,7 @@ gem 'omniauth-github'
24 24 # Extracting information from a git repository
25 25 # We cannot use original git since some bugs
26 26 gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git'
27   -gem 'gitlab_git', '~> 1.0.6'
  27 +gem 'gitlab_git', '~> 1.1.0'
28 28  
29 29 # Ruby/Rack Git Smart-HTTP Server Handler
30 30 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
... ... @@ -155,7 +155,7 @@ group :development, :test do
155 155  
156 156 # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
157 157 gem 'minitest'
158   -
  158 +
159 159 # Generate Fake data
160 160 gem "ffaker"
161 161  
... ...
Gemfile.lock
  Diff comments   View file @76d6bc4
... ... @@ -164,7 +164,7 @@ GEM
164 164 gitlab-pygments.rb (0.3.2)
165 165 posix-spawn (~> 0.3.6)
166 166 yajl-ruby (~> 1.1.0)
167   - gitlab_git (1.0.6)
  167 + gitlab_git (1.1.0)
168 168 activesupport (~> 3.2.13)
169 169 github-linguist (~> 2.3.4)
170 170 grit (~> 2.5.0)
... ... @@ -518,7 +518,7 @@ DEPENDENCIES
518 518 github-markup (~> 0.7.4)
519 519 gitlab-grack (~> 1.0.0)
520 520 gitlab-pygments.rb (~> 0.3.2)
521   - gitlab_git (~> 1.0.6)
  521 + gitlab_git (~> 1.1.0)
522 522 gitlab_meta (= 5.0)
523 523 gitlab_omniauth-ldap (= 1.0.2)
524 524 gollum-lib (~> 1.0.0)
... ...