Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit.

Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.

Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit.
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
Boyan Tabakov
1 parent d8562cc9
Showing 3 changed files with 7 additions and 9 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/flowdock_service.rb
@@ -112,7 +112,7 @@ gem &#39;tinder&#39;, &#39;~&gt; 1.9.2&#39;
 gem "hipchat", "~> 0.9.0"
  
 # Flowdock integration
-gem "flowdock-git-hook", "~> 0.4.2"
+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
  
 # d3
 gem "d3_rails", "~> 3.1.4"
@@ -135,9 +135,6 @@ GEM
       faraday (>= 0.7.4, < 0.9)
     ffaker (1.18.0)
     ffi (1.9.0)
-    flowdock-git-hook (0.4.2)
-      grit (>= 2.4.1)
-      multi_json
     fog (1.3.1)
       builder
       excon (~> 0.13.0)
@@ -164,6 +161,9 @@ GEM
       pygments.rb (>= 0.2.13)
     github-markdown (0.5.3)
     github-markup (0.7.5)
+    gitlab-flowdock-git-hook (0.4.2.2)
+      gitlab-grit (>= 2.4.1)
+      multi_json
     gitlab-gollum-lib (1.0.1)
       github-markdown (~> 0.5.3)
       github-markup (>= 0.7.5, < 1.0.0)
@@ -208,10 +208,6 @@ GEM
     grape-entity (0.3.0)
       activesupport
       multi_json (>= 1.3.2)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
     growl (1.0.3)
     guard (1.8.1)
       formatador (>= 0.2.4)
@@ -575,13 +571,13 @@ DEPENDENCIES
   enumerize
   factory_girl_rails
   ffaker
-  flowdock-git-hook (~> 0.4.2)
   fog (~> 1.3.1)
   font-awesome-rails
   foreman
   gemoji (~> 1.2.1)
   github-linguist
   github-markup (~> 0.7.4)
+  gitlab-flowdock-git-hook (~> 0.4.2)
   gitlab-gollum-lib (~> 1.0.1)
   gitlab-grack (~> 1.0.1)
   gitlab-pygments.rb (~> 0.3.2)
@@ -13,6 +13,8 @@
 #  project_url :string(255)
 #
  
+require "flowdock-git-hook"
+
 class FlowdockService < Service
   validates :token, presence: true, if: :activated?
...	...	@@ -112,7 +112,7 @@ gem 'tinder', '~> 1.9.2'
112	112	gem "hipchat", "~> 0.9.0"
113	113
114	114	# Flowdock integration
115		-gem "flowdock-git-hook", "~> 0.4.2"
	115	+gem "gitlab-flowdock-git-hook", "~> 0.4.2"
116	116
117	117	# d3
118	118	gem "d3_rails", "~> 3.1.4"
...	...
...	...	@@ -135,9 +135,6 @@ GEM
135	135	faraday (>= 0.7.4, < 0.9)
136	136	ffaker (1.18.0)
137	137	ffi (1.9.0)
138		- flowdock-git-hook (0.4.2)
139		- grit (>= 2.4.1)
140		- multi_json
141	138	fog (1.3.1)
142	139	builder
143	140	excon (~> 0.13.0)
...	...	@@ -164,6 +161,9 @@ GEM
164	161	pygments.rb (>= 0.2.13)
165	162	github-markdown (0.5.3)
166	163	github-markup (0.7.5)
	164	+ gitlab-flowdock-git-hook (0.4.2.2)
	165	+ gitlab-grit (>= 2.4.1)
	166	+ multi_json
167	167	gitlab-gollum-lib (1.0.1)
168	168	github-markdown (~> 0.5.3)
169	169	github-markup (>= 0.7.5, < 1.0.0)
...	...	@@ -208,10 +208,6 @@ GEM
208	208	grape-entity (0.3.0)
209	209	activesupport
210	210	multi_json (>= 1.3.2)
211		- grit (2.5.0)
212		- diff-lcs (~> 1.1)
213		- mime-types (~> 1.15)
214		- posix-spawn (~> 0.3.6)
215	211	growl (1.0.3)
216	212	guard (1.8.1)
217	213	formatador (>= 0.2.4)
...	...	@@ -575,13 +571,13 @@ DEPENDENCIES
575	571	enumerize
576	572	factory_girl_rails
577	573	ffaker
578		- flowdock-git-hook (~> 0.4.2)
579	574	fog (~> 1.3.1)
580	575	font-awesome-rails
581	576	foreman
582	577	gemoji (~> 1.2.1)
583	578	github-linguist
584	579	github-markup (~> 0.7.4)
	580	+ gitlab-flowdock-git-hook (~> 0.4.2)
585	581	gitlab-gollum-lib (~> 1.0.1)
586	582	gitlab-grack (~> 1.0.1)
587	583	gitlab-pygments.rb (~> 0.3.2)
...	...
...	...	@@ -13,6 +13,8 @@
13	13	# project_url :string(255)
14	14	#
15	15
	16	+require "flowdock-git-hook"
	17	+
16	18	class FlowdockService < Service
17	19	validates :token, presence: true, if: :activated?
18	20
...	...