Download as
Browse Code »

Commit 48dd07edbabaa349f55ca403cc157b8cfd155000

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

Revert "New gem versions" 

This reverts commit f74d4f20f234b8833628a2bc044cea2d1e953811.
Showing 2 changed files with 24 additions and 22 deletions   Show diff stats
@@ -24,7 +24,7 @@ gem 'omniauth-github' @@ -24,7 +24,7 @@ gem 'omniauth-github'
24 24
25 # Extracting information from a git repository 25 # Extracting information from a git repository
26 # Provide access to Gitlab::Git library 26 # Provide access to Gitlab::Git library
27 -gem "gitlab_git", "~> 3.1.0" 27 +gem "gitlab_git", "~> 3.0.0.rc2"
28 28
29 # Ruby/Rack Git Smart-HTTP Server Handler 29 # Ruby/Rack Git Smart-HTTP Server Handler
30 gem 'gitlab-grack', '~> 1.0.1', require: 'grack' 30 gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
@@ -33,13 +33,13 @@ gem 'gitlab-grack', '~> 1.0.1', require: 'grack' @@ -33,13 +33,13 @@ gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
33 gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" 33 gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
34 34
35 # Syntax highlighter 35 # Syntax highlighter
36 -gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb' 36 +gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
37 37
38 # Git Wiki 38 # Git Wiki
39 -gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib' 39 +gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib'
40 40
41 # Language detection 41 # Language detection
42 -gem "gitlab-linguist", "~> 2.9.5", require: "linguist" 42 +gem "github-linguist", require: "linguist"
43 43
44 # API 44 # API
45 gem "grape", "~> 0.4.1" 45 gem "grape", "~> 0.4.1"
@@ -116,7 +116,7 @@ GEM @@ -116,7 +116,7 @@ GEM
116 enumerize (0.6.1) 116 enumerize (0.6.1)
117 activesupport (>= 3.2) 117 activesupport (>= 3.2)
118 erubis (2.7.0) 118 erubis (2.7.0)
119 - escape_utils (0.3.2) 119 + escape_utils (0.2.4)
120 eventmachine (1.0.3) 120 eventmachine (1.0.3)
121 excon (0.13.4) 121 excon (0.13.4)
122 execjs (1.4.0) 122 execjs (1.4.0)
@@ -151,17 +151,22 @@ GEM @@ -151,17 +151,22 @@ GEM
151 fssm (0.2.10) 151 fssm (0.2.10)
152 gemoji (1.2.1) 152 gemoji (1.2.1)
153 gherkin-ruby (0.3.0) 153 gherkin-ruby (0.3.0)
154 - github-markdown (0.5.5) 154 + github-linguist (2.3.4)
  155 + charlock_holmes (~> 0.6.6)
  156 + escape_utils (~> 0.2.3)
  157 + mime-types (~> 1.19)
  158 + pygments.rb (>= 0.2.13)
  159 + github-markdown (0.5.3)
155 github-markup (0.7.5) 160 github-markup (0.7.5)
156 gitlab-flowdock-git-hook (0.4.2.2) 161 gitlab-flowdock-git-hook (0.4.2.2)
157 gitlab-grit (>= 2.4.1) 162 gitlab-grit (>= 2.4.1)
158 multi_json 163 multi_json
159 - gitlab-gollum-lib (1.0.2) 164 + gitlab-gollum-lib (1.0.1)
160 github-markdown (~> 0.5.3) 165 github-markdown (~> 0.5.3)
161 github-markup (>= 0.7.5, < 1.0.0) 166 github-markup (>= 0.7.5, < 1.0.0)
162 - gitlab-grit (~> 2.6.1)  
163 - gitlab-pygments.rb (~> 0.5.4) 167 + gitlab-grit (>= 2.5.1)
164 nokogiri (~> 1.5.9) 168 nokogiri (~> 1.5.9)
  169 + pygments.rb (~> 0.4.2)
165 sanitize (~> 2.0.3) 170 sanitize (~> 2.0.3)
166 stringex (~> 1.5.1) 171 stringex (~> 1.5.1)
167 gitlab-grack (1.0.1) 172 gitlab-grack (1.0.1)
@@ -171,19 +176,13 @@ GEM @@ -171,19 +176,13 @@ GEM
171 diff-lcs (~> 1.1) 176 diff-lcs (~> 1.1)
172 mime-types (~> 1.15) 177 mime-types (~> 1.15)
173 posix-spawn (~> 0.3.6) 178 posix-spawn (~> 0.3.6)
174 - gitlab-linguist (2.9.5)  
175 - charlock_holmes (~> 0.6.6)  
176 - escape_utils (~> 0.3.1)  
177 - gitlab-pygments.rb (~> 0.5.4)  
178 - mime-types (~> 1.19)  
179 - gitlab-pygments.rb (0.5.4) 179 + gitlab-pygments.rb (0.3.2)
180 posix-spawn (~> 0.3.6) 180 posix-spawn (~> 0.3.6)
181 yajl-ruby (~> 1.1.0) 181 yajl-ruby (~> 1.1.0)
182 - gitlab_git (3.1.0) 182 + gitlab_git (3.0.0.rc2)
183 activesupport (~> 3.2.13) 183 activesupport (~> 3.2.13)
  184 + github-linguist (~> 2.3.4)
184 gitlab-grit (~> 2.6.1) 185 gitlab-grit (~> 2.6.1)
185 - gitlab-linguist (~> 2.9.5)  
186 - gitlab-pygments.rb (~> 0.5.4)  
187 gitlab_meta (6.0) 186 gitlab_meta (6.0)
188 gitlab_omniauth-ldap (1.0.3) 187 gitlab_omniauth-ldap (1.0.3)
189 net-ldap (~> 0.3.1) 188 net-ldap (~> 0.3.1)
@@ -326,6 +325,9 @@ GEM @@ -326,6 +325,9 @@ GEM
326 coderay (~> 1.0.5) 325 coderay (~> 1.0.5)
327 method_source (~> 0.8) 326 method_source (~> 0.8)
328 slop (~> 3.4) 327 slop (~> 3.4)
  328 + pygments.rb (0.4.2)
  329 + posix-spawn (~> 0.3.6)
  330 + yajl-ruby (~> 1.1.0)
329 pyu-ruby-sasl (0.0.3.3) 331 pyu-ruby-sasl (0.0.3.3)
330 quiet_assets (1.0.2) 332 quiet_assets (1.0.2)
331 railties (>= 3.1, < 5.0) 333 railties (>= 3.1, < 5.0)
@@ -573,13 +575,13 @@ DEPENDENCIES @@ -573,13 +575,13 @@ DEPENDENCIES
573 font-awesome-rails 575 font-awesome-rails
574 foreman 576 foreman
575 gemoji (~> 1.2.1) 577 gemoji (~> 1.2.1)
  578 + github-linguist
576 github-markup (~> 0.7.4) 579 github-markup (~> 0.7.4)
577 gitlab-flowdock-git-hook (~> 0.4.2) 580 gitlab-flowdock-git-hook (~> 0.4.2)
578 - gitlab-gollum-lib (~> 1.0.2) 581 + gitlab-gollum-lib (~> 1.0.1)
579 gitlab-grack (~> 1.0.1) 582 gitlab-grack (~> 1.0.1)
580 - gitlab-linguist (~> 2.9.5)  
581 - gitlab-pygments.rb (~> 0.5.4)  
582 - gitlab_git (~> 3.1.0) 583 + gitlab-pygments.rb (~> 0.3.2)
  584 + gitlab_git (~> 3.0.0.rc2)
583 gitlab_meta (= 6.0) 585 gitlab_meta (= 6.0)
584 gitlab_omniauth-ldap (= 1.0.3) 586 gitlab_omniauth-ldap (= 1.0.3)
585 gon 587 gon