Merge branch 'gollum-lib' into 'master'

Use original gem gollum-lib

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