Download as
Browse Code »

Commit c4883ca225d1f4934cec737769fe22588b2bc8a8

Authored by Valeriy Sizov
1 parent 33955584
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update linguist and pygments #1602

Showing 3 changed files with 19 additions and 27 deletions   Show diff stats
@@ -23,15 +23,19 @@ gem 'omniauth-github' @@ -23,15 +23,19 @@ gem 'omniauth-github'
23 23
24 # GITLAB patched libs 24 # GITLAB patched libs
25 gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" 25 gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
26 -gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"  
27 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e" 26 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
28 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" 27 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
29 gem 'grack', :git => "https://github.com/gitlabhq/grack.git" 28 gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
30 -gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"  
31 29
32 # Gitolite client (for work with gitolite-admin repo) 30 # Gitolite client (for work with gitolite-admin repo)
33 gem "gitolite", '1.1.0' 31 gem "gitolite", '1.1.0'
34 32
  33 +# Syntax highlighter
  34 +gem "pygments.rb", "0.3.1"
  35 +
  36 +# Language detection
  37 +gem "github-linguist", "~> 2.3.4" , :require => "linguist"
  38 +
35 # API 39 # API
36 gem "grape", "~> 0.2.1" 40 gem "grape", "~> 0.2.1"
37 41
@@ -22,16 +22,6 @@ GIT @@ -22,16 +22,6 @@ GIT
22 posix-spawn (~> 0.3.6) 22 posix-spawn (~> 0.3.6)
23 23
24 GIT 24 GIT
25 - remote: https://github.com/gitlabhq/linguist.git  
26 - revision: c3d6fc5af8cf9d67afa572bba363bf0db256a900  
27 - specs:  
28 - linguist (1.0.0)  
29 - charlock_holmes (~> 0.6.6)  
30 - escape_utils (~> 0.2.3)  
31 - mime-types (~> 1.18)  
32 - pygments.rb (~> 0.2.11)  
33 -  
34 -GIT  
35 remote: https://github.com/gitlabhq/omniauth-ldap.git 25 remote: https://github.com/gitlabhq/omniauth-ldap.git
36 revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e 26 revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
37 ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e 27 ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
@@ -43,14 +33,6 @@ GIT @@ -43,14 +33,6 @@ GIT
43 rubyntlm (~> 0.1.1) 33 rubyntlm (~> 0.1.1)
44 34
45 GIT 35 GIT
46 - remote: https://github.com/gitlabhq/pygments.rb.git  
47 - revision: 2cada028da5054616634a1d9ca6941b65b3ce188  
48 - ref: 2cada028da5054616634a1d9ca6941b65b3ce188  
49 - specs:  
50 - pygments.rb (0.2.13)  
51 - rubypython (~> 0.6.1)  
52 -  
53 -GIT  
54 remote: https://github.com/gitlabhq/yaml_db.git 36 remote: https://github.com/gitlabhq/yaml_db.git
55 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd 37 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
56 specs: 38 specs:
@@ -157,6 +139,11 @@ GEM @@ -157,6 +139,11 @@ GEM
157 thor (>= 0.13.6) 139 thor (>= 0.13.6)
158 gherkin-ruby (0.2.1) 140 gherkin-ruby (0.2.1)
159 git (1.2.5) 141 git (1.2.5)
  142 + github-linguist (2.3.4)
  143 + charlock_holmes (~> 0.6.6)
  144 + escape_utils (~> 0.2.3)
  145 + mime-types (~> 1.19)
  146 + pygments.rb (>= 0.2.13)
160 github-markup (0.7.4) 147 github-markup (0.7.4)
161 gitlab_meta (2.9) 148 gitlab_meta (2.9)
162 gitolite (1.1.0) 149 gitolite (1.1.0)
@@ -264,6 +251,9 @@ GEM @@ -264,6 +251,9 @@ GEM
264 coderay (~> 1.0.5) 251 coderay (~> 1.0.5)
265 method_source (~> 0.7.1) 252 method_source (~> 0.7.1)
266 slop (>= 2.4.4, < 3) 253 slop (>= 2.4.4, < 3)
  254 + pygments.rb (0.3.1)
  255 + posix-spawn (~> 0.3.6)
  256 + yajl-ruby (~> 1.1.0)
267 pyu-ruby-sasl (0.0.3.3) 257 pyu-ruby-sasl (0.0.3.3)
268 rack (1.4.1) 258 rack (1.4.1)
269 rack-cache (1.2) 259 rack-cache (1.2)
@@ -330,9 +320,6 @@ GEM @@ -330,9 +320,6 @@ GEM
330 railties (>= 3.0) 320 railties (>= 3.0)
331 rspec (~> 2.10.0) 321 rspec (~> 2.10.0)
332 rubyntlm (0.1.1) 322 rubyntlm (0.1.1)
333 - rubypython (0.6.2)  
334 - blankslate (>= 2.1.2.3)  
335 - ffi (~> 1.0.7)  
336 rubyzip (0.9.8) 323 rubyzip (0.9.8)
337 sass (3.1.19) 324 sass (3.1.19)
338 sass-rails (3.2.5) 325 sass-rails (3.2.5)
@@ -403,6 +390,7 @@ GEM @@ -403,6 +390,7 @@ GEM
403 crack (>= 0.1.7) 390 crack (>= 0.1.7)
404 xpath (0.1.4) 391 xpath (0.1.4)
405 nokogiri (~> 1.3) 392 nokogiri (~> 1.3)
  393 + yajl-ruby (1.1.0)
406 394
407 PLATFORMS 395 PLATFORMS
408 ruby 396 ruby
@@ -427,6 +415,7 @@ DEPENDENCIES @@ -427,6 +415,7 @@ DEPENDENCIES
427 ffaker 415 ffaker
428 foreman 416 foreman
429 git 417 git
  418 + github-linguist (~> 2.3.4)
430 github-markup (~> 0.7.4) 419 github-markup (~> 0.7.4)
431 gitlab_meta (= 2.9) 420 gitlab_meta (= 2.9)
432 gitolite (= 1.1.0) 421 gitolite (= 1.1.0)
@@ -445,7 +434,6 @@ DEPENDENCIES @@ -445,7 +434,6 @@ DEPENDENCIES
445 kaminari 434 kaminari
446 launchy 435 launchy
447 letter_opener 436 letter_opener
448 - linguist (~> 1.0.0)!  
449 modernizr (= 2.5.3) 437 modernizr (= 2.5.3)
450 mysql2 438 mysql2
451 omniauth 439 omniauth
@@ -454,7 +442,7 @@ DEPENDENCIES @@ -454,7 +442,7 @@ DEPENDENCIES
454 omniauth-ldap! 442 omniauth-ldap!
455 omniauth-twitter 443 omniauth-twitter
456 pry 444 pry
457 - pygments.rb! 445 + pygments.rb (= 0.3.1)
458 rack-mini-profiler 446 rack-mini-profiler
459 rails (= 3.2.8) 447 rails (= 3.2.8)
460 raphael-rails (= 1.5.2) 448 raphael-rails (= 1.5.2)
spec/helpers/gitlab_markdown_helper_spec.rb
  Diff comments   View file @c4883ca
@@ -329,9 +329,9 @@ describe GitlabMarkdownHelper do @@ -329,9 +329,9 @@ describe GitlabMarkdownHelper do
329 end 329 end
330 330
331 it "should leave code blocks untouched" do 331 it "should leave code blocks untouched" do
332 - markdown("\n some code from $#{snippet.id}\n here too\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre>\n</div>\n" 332 + markdown("\n some code from $#{snippet.id}\n here too\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre></div>"
333 333
334 - markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre>\n</div>\n" 334 + markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should == "<div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> $#{snippet.id}\n<span class=\"n\">here</span> <span class=\"n\">too</span>\n</pre></div>"
335 end 335 end
336 336
337 it "should leave inline code untouched" do 337 it "should leave inline code untouched" do