Download as
Browse Code »

Commit a54f2d512a84a328ef4dfb1a3d8a1915579b8bfc

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

Update gitlab_git version

Showing 2 changed files with 9 additions and 9 deletions   Show diff stats
@@ -23,7 +23,7 @@ gem 'omniauth-github' @@ -23,7 +23,7 @@ gem 'omniauth-github'
23 23
24 # Extracting information from a git repository 24 # Extracting information from a git repository
25 # Provide access to Gitlab::Git library 25 # Provide access to Gitlab::Git library
26 -gem 'gitlab_git', '~> 1.3.0' 26 +gem 'gitlab_git', '~> 1.4.1'
27 27
28 # Ruby/Rack Git Smart-HTTP Server Handler 28 # Ruby/Rack Git Smart-HTTP Server Handler
29 gem 'gitlab-grack', '~> 1.0.1', require: 'grack' 29 gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
@@ -35,7 +35,7 @@ gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" @@ -35,7 +35,7 @@ gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
35 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb' 35 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
36 36
37 # Git Wiki 37 # Git Wiki
38 -gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib' 38 +gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib'
39 39
40 # Language detection 40 # Language detection
41 gem "github-linguist", require: "linguist" 41 gem "github-linguist", require: "linguist"
@@ -147,17 +147,17 @@ GEM @@ -147,17 +147,17 @@ GEM
147 pygments.rb (>= 0.2.13) 147 pygments.rb (>= 0.2.13)
148 github-markdown (0.5.3) 148 github-markdown (0.5.3)
149 github-markup (0.7.5) 149 github-markup (0.7.5)
150 - gitlab-gollum-lib (1.0.0) 150 + gitlab-gollum-lib (1.0.1)
151 github-markdown (~> 0.5.3) 151 github-markdown (~> 0.5.3)
152 github-markup (>= 0.7.5, < 1.0.0) 152 github-markup (>= 0.7.5, < 1.0.0)
153 - gitlab-grit (~> 2.5.1) 153 + gitlab-grit (>= 2.5.1)
154 nokogiri (~> 1.5.9) 154 nokogiri (~> 1.5.9)
155 pygments.rb (~> 0.4.2) 155 pygments.rb (~> 0.4.2)
156 sanitize (~> 2.0.3) 156 sanitize (~> 2.0.3)
157 stringex (~> 1.5.1) 157 stringex (~> 1.5.1)
158 gitlab-grack (1.0.1) 158 gitlab-grack (1.0.1)
159 rack (~> 1.4.1) 159 rack (~> 1.4.1)
160 - gitlab-grit (2.5.1) 160 + gitlab-grit (2.6.0)
161 charlock_holmes (~> 0.6.9) 161 charlock_holmes (~> 0.6.9)
162 diff-lcs (~> 1.1) 162 diff-lcs (~> 1.1)
163 mime-types (~> 1.15) 163 mime-types (~> 1.15)
@@ -165,10 +165,10 @@ GEM @@ -165,10 +165,10 @@ GEM
165 gitlab-pygments.rb (0.3.2) 165 gitlab-pygments.rb (0.3.2)
166 posix-spawn (~> 0.3.6) 166 posix-spawn (~> 0.3.6)
167 yajl-ruby (~> 1.1.0) 167 yajl-ruby (~> 1.1.0)
168 - gitlab_git (1.3.0) 168 + gitlab_git (1.4.1)
169 activesupport (~> 3.2.13) 169 activesupport (~> 3.2.13)
170 github-linguist (~> 2.3.4) 170 github-linguist (~> 2.3.4)
171 - gitlab-grit (~> 2.5.1) 171 + gitlab-grit (~> 2.6.0)
172 gitlab_meta (6.0) 172 gitlab_meta (6.0)
173 gitlab_omniauth-ldap (1.0.3) 173 gitlab_omniauth-ldap (1.0.3)
174 net-ldap (~> 0.3.1) 174 net-ldap (~> 0.3.1)
@@ -543,10 +543,10 @@ DEPENDENCIES @@ -543,10 +543,10 @@ DEPENDENCIES
543 gemoji (~> 1.2.1) 543 gemoji (~> 1.2.1)
544 github-linguist 544 github-linguist
545 github-markup (~> 0.7.4) 545 github-markup (~> 0.7.4)
546 - gitlab-gollum-lib (~> 1.0.0) 546 + gitlab-gollum-lib (~> 1.0.1)
547 gitlab-grack (~> 1.0.1) 547 gitlab-grack (~> 1.0.1)
548 gitlab-pygments.rb (~> 0.3.2) 548 gitlab-pygments.rb (~> 0.3.2)
549 - gitlab_git (~> 1.3.0) 549 + gitlab_git (~> 1.4.1)
550 gitlab_meta (= 6.0) 550 gitlab_meta (= 6.0)
551 gitlab_omniauth-ldap (= 1.0.3) 551 gitlab_omniauth-ldap (= 1.0.3)
552 gon 552 gon