Fix project namespaces for web hooks data

Dmitriy Zaporozhets
1 parent 59a86e42
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/models/project.rb
app/roles/push_observer.rb
@@ -192,7 +192,7 @@ class Project &lt; ActiveRecord::Base
   end
   def web_url
-    [Gitlab.config.url, path].join("/")
+    [Gitlab.config.url, path_with_namespace].join("/")
   end
   def common_notes
@@ -114,7 +114,7 @@ module PushObserver
         id: commit.id,
         message: commit.safe_message,
         timestamp: commit.date.xmlschema,
-        url: "#{Gitlab.config.url}/#{path}/commit/#{commit.id}",
+        url: "#{Gitlab.config.url}/#{path_with_namespace}/commit/#{commit.id}",
         author: {
           name: commit.author_name,
           email: commit.author_email
	@@ -192,7 +192,7 @@ class Project < ActiveRecord::Base		@@ -192,7 +192,7 @@ class Project < ActiveRecord::Base
192	end	192	end
193		193
194	def web_url	194	def web_url
195	- [Gitlab.config.url, path].join("/")	195	+ [Gitlab.config.url, path_with_namespace].join("/")
196	end	196	end
197		197
198	def common_notes	198	def common_notes
	@@ -114,7 +114,7 @@ module PushObserver		@@ -114,7 +114,7 @@ module PushObserver
114	id: commit.id,	114	id: commit.id,
115	message: commit.safe_message,	115	message: commit.safe_message,
116	timestamp: commit.date.xmlschema,	116	timestamp: commit.date.xmlschema,
117	- url: "#{Gitlab.config.url}/#{path}/commit/#{commit.id}",	117	+ url: "#{Gitlab.config.url}/#{path_with_namespace}/commit/#{commit.id}",
118	author: {	118	author: {
119	name: commit.author_name,	119	name: commit.author_name,
120	email: commit.author_email	120	email: commit.author_email