Download as
Browse Code »

Commit f382983f1a136a58baffe911f8dec11bfcbea64b

Authored by Dmitriy Zaporozhets
2 parents 24934c9b 684877ac
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'gollum-lib' into 'master' 

Use original gem gollum-lib
Showing 4 changed files with 41 additions and 39 deletions   Show diff stats
@@ -39,7 +39,7 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' @@ -39,7 +39,7 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
39 gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap" 39 gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
40 40
41 # Git Wiki 41 # Git Wiki
42 -gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib' 42 +gem 'gollum-lib', '~> 3.0.0'
43 43
44 # Language detection 44 # Language detection
45 gem "gitlab-linguist", "~> 3.0.0", require: "linguist" 45 gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
@@ -70,7 +70,7 @@ gem "haml-rails" @@ -70,7 +70,7 @@ gem "haml-rails"
70 gem "carrierwave" 70 gem "carrierwave"
71 71
72 # for aws storage 72 # for aws storage
73 -gem "fog", "~> 1.3.1", group: :aws 73 +gem "fog", "~> 1.14", group: :aws
74 74
75 # Authorization 75 # Authorization
76 gem "six" 76 gem "six"
@@ -80,7 +80,7 @@ gem "seed-fu" @@ -80,7 +80,7 @@ gem "seed-fu"
80 80
81 # Markdown to HTML 81 # Markdown to HTML
82 gem "redcarpet", "~> 2.2.2" 82 gem "redcarpet", "~> 2.2.2"
83 -gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4' 83 +gem "github-markup"
84 84
85 # Asciidoc to HTML 85 # Asciidoc to HTML
86 gem "asciidoctor" 86 gem "asciidoctor"
@@ -140,7 +140,7 @@ gem "d3_rails", "~> 3.1.4" @@ -140,7 +140,7 @@ gem "d3_rails", "~> 3.1.4"
140 gem "underscore-rails", "~> 1.4.4" 140 gem "underscore-rails", "~> 1.4.4"
141 141
142 # Sanitize user input 142 # Sanitize user input
143 -gem "sanitize" 143 +gem "sanitize", '~> 2.0'
144 144
145 # Protect against bruteforcing 145 # Protect against bruteforcing
146 gem "rack-attack" 146 gem "rack-attack"
1 GIT 1 GIT
2 - remote: https://github.com/gitlabhq/markup.git  
3 - revision: 61ade389c1e1c159359338f570d18464a44ddbc4  
4 - ref: 61ade389c1e1c159359338f570d18464a44ddbc4  
5 - specs:  
6 - github-markup (0.7.6)  
7 -  
8 -GIT  
9 remote: https://github.com/intridea/grape-entity.git 2 remote: https://github.com/intridea/grape-entity.git
10 revision: d904381c951e86250c3f44213b349a3dd8e83fb1 3 revision: d904381c951e86250c3f44213b349a3dd8e83fb1
11 ref: d904381c951e86250c3f44213b349a3dd8e83fb1 4 ref: d904381c951e86250c3f44213b349a3dd8e83fb1
@@ -132,7 +125,7 @@ GEM @@ -132,7 +125,7 @@ GEM
132 erubis (2.7.0) 125 erubis (2.7.0)
133 escape_utils (0.2.4) 126 escape_utils (0.2.4)
134 eventmachine (1.0.3) 127 eventmachine (1.0.3)
135 - excon (0.13.4) 128 + excon (0.32.1)
136 execjs (2.0.2) 129 execjs (2.0.2)
137 factory_girl (4.3.0) 130 factory_girl (4.3.0)
138 activesupport (>= 3.0.0) 131 activesupport (>= 3.0.0)
@@ -145,16 +138,23 @@ GEM @@ -145,16 +138,23 @@ GEM
145 faraday (>= 0.7.4, < 0.9) 138 faraday (>= 0.7.4, < 0.9)
146 ffaker (1.22.1) 139 ffaker (1.22.1)
147 ffi (1.9.3) 140 ffi (1.9.3)
148 - fog (1.3.1) 141 + fog (1.21.0)
  142 + fog-brightbox
  143 + fog-core (~> 1.21, >= 1.21.1)
  144 + fog-json
  145 + nokogiri (~> 1.5, >= 1.5.11)
  146 + fog-brightbox (0.0.1)
  147 + fog-core
  148 + fog-json
  149 + fog-core (1.21.1)
149 builder 150 builder
150 - excon (~> 0.13.0) 151 + excon (~> 0.32)
151 formatador (~> 0.2.0) 152 formatador (~> 0.2.0)
152 mime-types 153 mime-types
153 - multi_json (~> 1.0)  
154 - net-scp (~> 1.0.4) 154 + net-scp (~> 1.1)
155 net-ssh (>= 2.1.3) 155 net-ssh (>= 2.1.3)
156 - nokogiri (~> 1.5.0)  
157 - ruby-hmac 156 + fog-json (1.0.0)
  157 + multi_json (~> 1.0)
158 font-awesome-rails (3.2.1.3) 158 font-awesome-rails (3.2.1.3)
159 railties (>= 3.2, < 5.0) 159 railties (>= 3.2, < 5.0)
160 foreman (0.63.0) 160 foreman (0.63.0)
@@ -165,17 +165,10 @@ GEM @@ -165,17 +165,10 @@ GEM
165 rugged (~> 0.19) 165 rugged (~> 0.19)
166 gherkin-ruby (0.3.1) 166 gherkin-ruby (0.3.1)
167 racc 167 racc
168 - github-markdown (0.5.5) 168 + github-markup (1.1.0)
169 gitlab-flowdock-git-hook (0.4.2.2) 169 gitlab-flowdock-git-hook (0.4.2.2)
170 gitlab-grit (>= 2.4.1) 170 gitlab-grit (>= 2.4.1)
171 multi_json 171 multi_json
172 - gitlab-gollum-lib (1.1.0)  
173 - github-markdown (~> 0.5.3)  
174 - github-markup (>= 0.7.5, < 1.0.0)  
175 - gitlab-grit (~> 2.6.1)  
176 - nokogiri (~> 1.5.9)  
177 - sanitize (~> 2.0.3)  
178 - stringex (~> 1.5.1)  
179 gitlab-grack (2.0.0.pre) 172 gitlab-grack (2.0.0.pre)
180 rack (~> 1.5.1) 173 rack (~> 1.5.1)
181 gitlab-grit (2.6.5) 174 gitlab-grit (2.6.5)
@@ -201,6 +194,13 @@ GEM @@ -201,6 +194,13 @@ GEM
201 omniauth (~> 1.0) 194 omniauth (~> 1.0)
202 pyu-ruby-sasl (~> 0.0.3.1) 195 pyu-ruby-sasl (~> 0.0.3.1)
203 rubyntlm (~> 0.1.1) 196 rubyntlm (~> 0.1.1)
  197 + gollum-lib (3.0.0)
  198 + github-markup (~> 1.1.0)
  199 + gitlab-grit (~> 2.6.5)
  200 + nokogiri (~> 1.6.1)
  201 + rouge (~> 1.3.3)
  202 + sanitize (~> 2.1.0)
  203 + stringex (~> 2.5.1)
204 gon (5.0.1) 204 gon (5.0.1)
205 actionpack (>= 2.3.0) 205 actionpack (>= 2.3.0)
206 json 206 json
@@ -284,16 +284,18 @@ GEM @@ -284,16 +284,18 @@ GEM
284 treetop (~> 1.4.8) 284 treetop (~> 1.4.8)
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 + mini_portile (0.5.3)
287 minitest (4.7.5) 288 minitest (4.7.5)
288 multi_json (1.9.2) 289 multi_json (1.9.2)
289 multi_xml (0.5.5) 290 multi_xml (0.5.5)
290 multipart-post (1.2.0) 291 multipart-post (1.2.0)
291 mysql2 (0.3.11) 292 mysql2 (0.3.11)
292 net-ldap (0.3.1) 293 net-ldap (0.3.1)
293 - net-scp (1.0.4)  
294 - net-ssh (>= 1.99.1)  
295 - net-ssh (2.7.0)  
296 - nokogiri (1.5.10) 294 + net-scp (1.1.2)
  295 + net-ssh (>= 2.6.5)
  296 + net-ssh (2.8.0)
  297 + nokogiri (1.6.1)
  298 + mini_portile (~> 0.5.0)
297 nprogress-rails (0.1.2.3) 299 nprogress-rails (0.1.2.3)
298 oauth (0.4.7) 300 oauth (0.4.7)
299 oauth2 (0.8.1) 301 oauth2 (0.8.1)
@@ -410,6 +412,7 @@ GEM @@ -410,6 +412,7 @@ GEM
410 require_all (1.3.2) 412 require_all (1.3.2)
411 rest-client (1.6.7) 413 rest-client (1.6.7)
412 mime-types (>= 1.16) 414 mime-types (>= 1.16)
  415 + rouge (1.3.3)
413 rspec (2.14.1) 416 rspec (2.14.1)
414 rspec-core (~> 2.14.0) 417 rspec-core (~> 2.14.0)
415 rspec-expectations (~> 2.14.0) 418 rspec-expectations (~> 2.14.0)
@@ -425,12 +428,11 @@ GEM @@ -425,12 +428,11 @@ GEM
425 rspec-core (~> 2.14.0) 428 rspec-core (~> 2.14.0)
426 rspec-expectations (~> 2.14.0) 429 rspec-expectations (~> 2.14.0)
427 rspec-mocks (~> 2.14.0) 430 rspec-mocks (~> 2.14.0)
428 - ruby-hmac (0.4.0)  
429 ruby-progressbar (1.2.0) 431 ruby-progressbar (1.2.0)
430 rubyntlm (0.1.1) 432 rubyntlm (0.1.1)
431 rugged (0.19.0) 433 rugged (0.19.0)
432 safe_yaml (0.9.7) 434 safe_yaml (0.9.7)
433 - sanitize (2.0.6) 435 + sanitize (2.1.0)
434 nokogiri (>= 1.4.4) 436 nokogiri (>= 1.4.4)
435 sass (3.2.12) 437 sass (3.2.12)
436 sass-rails (4.0.1) 438 sass-rails (4.0.1)
@@ -494,7 +496,7 @@ GEM @@ -494,7 +496,7 @@ GEM
494 sprockets (~> 2.8) 496 sprockets (~> 2.8)
495 stamp (0.5.0) 497 stamp (0.5.0)
496 state_machine (1.2.0) 498 state_machine (1.2.0)
497 - stringex (1.5.1) 499 + stringex (2.5.1)
498 temple (0.6.7) 500 temple (0.6.7)
499 term-ansicolor (1.2.2) 501 term-ansicolor (1.2.2)
500 tins (~> 0.8) 502 tins (~> 0.8)
@@ -583,19 +585,19 @@ DEPENDENCIES @@ -583,19 +585,19 @@ DEPENDENCIES
583 enumerize 585 enumerize
584 factory_girl_rails 586 factory_girl_rails
585 ffaker 587 ffaker
586 - fog (~> 1.3.1) 588 + fog (~> 1.14)
587 font-awesome-rails (~> 3.2) 589 font-awesome-rails (~> 3.2)
588 foreman 590 foreman
589 gemnasium-gitlab-service (~> 0.2) 591 gemnasium-gitlab-service (~> 0.2)
590 - github-markup (~> 0.7.4)! 592 + github-markup
591 gitlab-flowdock-git-hook (~> 0.4.2) 593 gitlab-flowdock-git-hook (~> 0.4.2)
592 - gitlab-gollum-lib (~> 1.1.0)  
593 gitlab-grack (~> 2.0.0.pre) 594 gitlab-grack (~> 2.0.0.pre)
594 gitlab-linguist (~> 3.0.0) 595 gitlab-linguist (~> 3.0.0)
595 gitlab_emoji (~> 0.0.1.1) 596 gitlab_emoji (~> 0.0.1.1)
596 gitlab_git (~> 5.8) 597 gitlab_git (~> 5.8)
597 gitlab_meta (= 6.0) 598 gitlab_meta (= 6.0)
598 gitlab_omniauth-ldap (= 1.0.4) 599 gitlab_omniauth-ldap (= 1.0.4)
  600 + gollum-lib (~> 3.0.0)
599 gon (~> 5.0.0) 601 gon (~> 5.0.0)
600 grape (~> 0.6.1) 602 grape (~> 0.6.1)
601 grape-entity (~> 0.4.1)! 603 grape-entity (~> 0.4.1)!
@@ -637,7 +639,7 @@ DEPENDENCIES @@ -637,7 +639,7 @@ DEPENDENCIES
637 redcarpet (~> 2.2.2) 639 redcarpet (~> 2.2.2)
638 redis-rails 640 redis-rails
639 rspec-rails 641 rspec-rails
640 - sanitize 642 + sanitize (~> 2.0)
641 sass-rails 643 sass-rails
642 sdoc 644 sdoc
643 seed-fu 645 seed-fu
app/models/gollum_wiki.rb
  Diff comments   View file @f382983
@@ -41,7 +41,7 @@ class GollumWiki @@ -41,7 +41,7 @@ class GollumWiki
41 def wiki 41 def wiki
42 @wiki ||= begin 42 @wiki ||= begin
43 Gollum::Wiki.new(path_to_repo) 43 Gollum::Wiki.new(path_to_repo)
44 - rescue Grit::NoSuchPathError 44 + rescue Gollum::NoSuchPathError
45 create_repo! 45 create_repo!
46 end 46 end
47 end 47 end
spec/models/project_spec.rb
  Diff comments   View file @f382983
@@ -74,7 +74,7 @@ describe Project do @@ -74,7 +74,7 @@ describe Project do
74 project2 = build(:project) 74 project2 = build(:project)
75 project2.stub(:creator).and_return(double(can_create_project?: false, projects_limit: 0).as_null_object) 75 project2.stub(:creator).and_return(double(can_create_project?: false, projects_limit: 0).as_null_object)
76 project2.should_not be_valid 76 project2.should_not be_valid
77 - project2.errors[:limit_reached].first.should match(/Your own projects limit is 0/) 77 + project2.errors[:limit_reached].first.should match(/Your project limit is 0/)
78 end 78 end
79 end 79 end
80 80