Download as
Browse Code »

Commit 6abd1f9347d598d58fd43033816413640fc64049

Authored by Dmitriy Zaporozhets
2 parents 77047ae8 f539c8a3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'update/gems' of /home/git/repositories/gitlab/gitlabhq

Showing 3 changed files with 24 additions and 25 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.0.0.rc2" 27 +gem "gitlab_git", "~> 3.1.0"
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.3.2', require: 'pygments.rb' 36 +gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
37 37
38 # Git Wiki 38 # Git Wiki
39 -gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib' 39 +gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
40 40
41 # Language detection 41 # Language detection
42 -gem "github-linguist", require: "linguist" 42 +gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
43 43
44 # API 44 # API
45 gem "grape", "~> 0.4.1" 45 gem "grape", "~> 0.4.1"
@@ -151,22 +151,17 @@ GEM @@ -151,22 +151,17 @@ 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-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) 154 + github-markdown (0.5.5)
160 github-markup (0.7.5) 155 github-markup (0.7.5)
161 gitlab-flowdock-git-hook (0.4.2.2) 156 gitlab-flowdock-git-hook (0.4.2.2)
162 gitlab-grit (>= 2.4.1) 157 gitlab-grit (>= 2.4.1)
163 multi_json 158 multi_json
164 - gitlab-gollum-lib (1.0.1) 159 + gitlab-gollum-lib (1.0.2)
165 github-markdown (~> 0.5.3) 160 github-markdown (~> 0.5.3)
166 github-markup (>= 0.7.5, < 1.0.0) 161 github-markup (>= 0.7.5, < 1.0.0)
167 - gitlab-grit (>= 2.5.1) 162 + gitlab-grit (~> 2.6.1)
  163 + gitlab-pygments.rb (~> 0.5.4)
168 nokogiri (~> 1.5.9) 164 nokogiri (~> 1.5.9)
169 - pygments.rb (~> 0.4.2)  
170 sanitize (~> 2.0.3) 165 sanitize (~> 2.0.3)
171 stringex (~> 1.5.1) 166 stringex (~> 1.5.1)
172 gitlab-grack (1.0.1) 167 gitlab-grack (1.0.1)
@@ -176,13 +171,19 @@ GEM @@ -176,13 +171,19 @@ GEM
176 diff-lcs (~> 1.1) 171 diff-lcs (~> 1.1)
177 mime-types (~> 1.15) 172 mime-types (~> 1.15)
178 posix-spawn (~> 0.3.6) 173 posix-spawn (~> 0.3.6)
179 - gitlab-pygments.rb (0.3.2) 174 + gitlab-linguist (2.9.6)
  175 + charlock_holmes (~> 0.6.6)
  176 + escape_utils (~> 0.2.4)
  177 + gitlab-pygments.rb (~> 0.5.4)
  178 + mime-types (~> 1.19)
  179 + gitlab-pygments.rb (0.5.4)
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.0.0.rc2) 182 + gitlab_git (3.1.0)
183 activesupport (~> 3.2.13) 183 activesupport (~> 3.2.13)
184 - github-linguist (~> 2.3.4)  
185 gitlab-grit (~> 2.6.1) 184 gitlab-grit (~> 2.6.1)
  185 + gitlab-linguist (~> 2.9.5)
  186 + gitlab-pygments.rb (~> 0.5.4)
186 gitlab_meta (6.0) 187 gitlab_meta (6.0)
187 gitlab_omniauth-ldap (1.0.3) 188 gitlab_omniauth-ldap (1.0.3)
188 net-ldap (~> 0.3.1) 189 net-ldap (~> 0.3.1)
@@ -325,9 +326,6 @@ GEM @@ -325,9 +326,6 @@ GEM
325 coderay (~> 1.0.5) 326 coderay (~> 1.0.5)
326 method_source (~> 0.8) 327 method_source (~> 0.8)
327 slop (~> 3.4) 328 slop (~> 3.4)
328 - pygments.rb (0.4.2)  
329 - posix-spawn (~> 0.3.6)  
330 - yajl-ruby (~> 1.1.0)  
331 pyu-ruby-sasl (0.0.3.3) 329 pyu-ruby-sasl (0.0.3.3)
332 quiet_assets (1.0.2) 330 quiet_assets (1.0.2)
333 railties (>= 3.1, < 5.0) 331 railties (>= 3.1, < 5.0)
@@ -575,13 +573,13 @@ DEPENDENCIES @@ -575,13 +573,13 @@ DEPENDENCIES
575 font-awesome-rails 573 font-awesome-rails
576 foreman 574 foreman
577 gemoji (~> 1.2.1) 575 gemoji (~> 1.2.1)
578 - github-linguist  
579 github-markup (~> 0.7.4) 576 github-markup (~> 0.7.4)
580 gitlab-flowdock-git-hook (~> 0.4.2) 577 gitlab-flowdock-git-hook (~> 0.4.2)
581 - gitlab-gollum-lib (~> 1.0.1) 578 + gitlab-gollum-lib (~> 1.0.2)
582 gitlab-grack (~> 1.0.1) 579 gitlab-grack (~> 1.0.1)
583 - gitlab-pygments.rb (~> 0.3.2)  
584 - gitlab_git (~> 3.0.0.rc2) 580 + gitlab-linguist (~> 2.9.6)
  581 + gitlab-pygments.rb (~> 0.5.4)
  582 + gitlab_git (~> 3.1.0)
585 gitlab_meta (= 6.0) 583 gitlab_meta (= 6.0)
586 gitlab_omniauth-ldap (= 1.0.3) 584 gitlab_omniauth-ldap (= 1.0.3)
587 gon 585 gon
spec/helpers/gitlab_markdown_helper_spec.rb
  Diff comments   View file @6abd1f9
@@ -378,9 +378,10 @@ describe GitlabMarkdownHelper do @@ -378,9 +378,10 @@ describe GitlabMarkdownHelper do
378 it "should leave code blocks untouched" do 378 it "should leave code blocks untouched" do
379 helper.stub(:user_color_scheme_class).and_return(:white) 379 helper.stub(:user_color_scheme_class).and_return(:white)
380 380
381 - helper.markdown("\n some code from $#{snippet.id}\n here too\n").should include("<div class=\"white\"><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></div>") 381 + target_html = "<div class=\"white\"><div class=\"highlight\"><pre><span class=\"n\">some</span> <span class=\"n\">code</span> <span class=\"n\">from</span> <span class=\"err\">$</span><span class=\"mi\">#{snippet.id}</span>"
382 382
383 - helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should include("<div class=\"white\"><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></div>") 383 + helper.markdown("\n some code from $#{snippet.id}\n here too\n").should include(target_html)
  384 + helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should include(target_html)
384 end 385 end
385 386
386 it "should leave inline code untouched" do 387 it "should leave inline code untouched" do