Download as
Browse Code »

Commit 64341cca116cd7aae158990432a25eeda84ca0e5

Authored by Dmitriy Zaporozhets
2 parents 7611ce72 11f864c9
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'gems-bump' into 'master' 

Update gitlab_git and gitlab-grit gem versions
Showing 2 changed files with 15 additions and 15 deletions   Show diff stats
@@ -30,7 +30,7 @@ gem 'omniauth-github' @@ -30,7 +30,7 @@ gem 'omniauth-github'
30 30
31 # Extracting information from a git repository 31 # Extracting information from a git repository
32 # Provide access to Gitlab::Git library 32 # Provide access to Gitlab::Git library
33 -gem "gitlab_git", '~> 5.7.1' 33 +gem "gitlab_git", '~> 5.8'
34 34
35 # Ruby/Rack Git Smart-HTTP Server Handler 35 # Ruby/Rack Git Smart-HTTP Server Handler
36 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' 36 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
@@ -50,7 +50,7 @@ GEM @@ -50,7 +50,7 @@ GEM
50 rake (>= 0.8.7) 50 rake (>= 0.8.7)
51 arel (4.0.2) 51 arel (4.0.2)
52 asciidoctor (0.1.4) 52 asciidoctor (0.1.4)
53 - atomic (1.1.14) 53 + atomic (1.1.16)
54 awesome_print (1.2.0) 54 awesome_print (1.2.0)
55 axiom-types (0.0.5) 55 axiom-types (0.0.5)
56 descendants_tracker (~> 0.0.1) 56 descendants_tracker (~> 0.0.1)
@@ -178,22 +178,22 @@ GEM @@ -178,22 +178,22 @@ GEM
178 stringex (~> 1.5.1) 178 stringex (~> 1.5.1)
179 gitlab-grack (2.0.0.pre) 179 gitlab-grack (2.0.0.pre)
180 rack (~> 1.5.1) 180 rack (~> 1.5.1)
181 - gitlab-grit (2.6.4)  
182 - charlock_holmes (~> 0.6.9) 181 + gitlab-grit (2.6.5)
  182 + charlock_holmes (~> 0.6)
183 diff-lcs (~> 1.1) 183 diff-lcs (~> 1.1)
184 mime-types (~> 1.15) 184 mime-types (~> 1.15)
185 - posix-spawn (~> 0.3.6) 185 + posix-spawn (~> 0.3)
186 gitlab-linguist (3.0.0) 186 gitlab-linguist (3.0.0)
187 charlock_holmes (~> 0.6.6) 187 charlock_holmes (~> 0.6.6)
188 escape_utils (~> 0.2.4) 188 escape_utils (~> 0.2.4)
189 mime-types (~> 1.19) 189 mime-types (~> 1.19)
190 gitlab_emoji (0.0.1.1) 190 gitlab_emoji (0.0.1.1)
191 emoji (~> 1.0.1) 191 emoji (~> 1.0.1)
192 - gitlab_git (5.7.1)  
193 - activesupport (~> 4.0.0)  
194 - charlock_holmes (~> 0.6.9)  
195 - gitlab-grit (~> 2.6.1)  
196 - gitlab-linguist (~> 3.0.0) 192 + gitlab_git (5.8.0)
  193 + activesupport (~> 4.0)
  194 + charlock_holmes (~> 0.6)
  195 + gitlab-grit (~> 2.6)
  196 + gitlab-linguist (~> 3.0)
197 rugged (~> 0.19.0) 197 rugged (~> 0.19.0)
198 gitlab_meta (6.0) 198 gitlab_meta (6.0)
199 gitlab_omniauth-ldap (1.0.4) 199 gitlab_omniauth-ldap (1.0.4)
@@ -285,7 +285,7 @@ GEM @@ -285,7 +285,7 @@ GEM
285 method_source (0.8.2) 285 method_source (0.8.2)
286 mime-types (1.25.1) 286 mime-types (1.25.1)
287 minitest (4.7.5) 287 minitest (4.7.5)
288 - multi_json (1.8.4) 288 + multi_json (1.9.2)
289 multi_xml (0.5.5) 289 multi_xml (0.5.5)
290 multipart-post (1.2.0) 290 multipart-post (1.2.0)
291 mysql2 (0.3.11) 291 mysql2 (0.3.11)
@@ -507,8 +507,8 @@ GEM @@ -507,8 +507,8 @@ GEM
507 eventmachine (>= 1.0.0) 507 eventmachine (>= 1.0.0)
508 rack (>= 1.0.0) 508 rack (>= 1.0.0)
509 thor (0.18.1) 509 thor (0.18.1)
510 - thread_safe (0.1.3)  
511 - atomic 510 + thread_safe (0.3.1)
  511 + atomic (>= 1.1.7, < 2)
512 tilt (1.4.1) 512 tilt (1.4.1)
513 timers (1.1.0) 513 timers (1.1.0)
514 tinder (1.9.3) 514 tinder (1.9.3)
@@ -530,7 +530,7 @@ GEM @@ -530,7 +530,7 @@ GEM
530 eventmachine (>= 0.12.8) 530 eventmachine (>= 0.12.8)
531 http_parser.rb (~> 0.5.1) 531 http_parser.rb (~> 0.5.1)
532 simple_oauth (~> 0.1.4) 532 simple_oauth (~> 0.1.4)
533 - tzinfo (0.3.38) 533 + tzinfo (0.3.39)
534 uglifier (2.3.2) 534 uglifier (2.3.2)
535 execjs (>= 0.3.0) 535 execjs (>= 0.3.0)
536 json (>= 1.8.0) 536 json (>= 1.8.0)
@@ -593,7 +593,7 @@ DEPENDENCIES @@ -593,7 +593,7 @@ DEPENDENCIES
593 gitlab-grack (~> 2.0.0.pre) 593 gitlab-grack (~> 2.0.0.pre)
594 gitlab-linguist (~> 3.0.0) 594 gitlab-linguist (~> 3.0.0)
595 gitlab_emoji (~> 0.0.1.1) 595 gitlab_emoji (~> 0.0.1.1)
596 - gitlab_git (~> 5.7.1) 596 + gitlab_git (~> 5.8)
597 gitlab_meta (= 6.0) 597 gitlab_meta (= 6.0)
598 gitlab_omniauth-ldap (= 1.0.4) 598 gitlab_omniauth-ldap (= 1.0.4)
599 gon (~> 5.0.0) 599 gon (~> 5.0.0)