Procfile added. use foreman start to run gitlabhq

Dmitriy Zaporozhets
1 parent 2d3b6375
Showing 5 changed files with 19 additions and 2 deletions Show diff stats
.foreman
Procfile
app/controllers/hooks_controller.rb
app/views/hooks/show.html.haml
config/routes.rb
@@ -0,0 +1 @@
+port: 9999
@@ -0,0 +1,2 @@
+web: bundle exec rails s -p $PORT
+worker: bundle exec rake environment resque:work QUEUE=* 
@@ -29,6 +29,15 @@ class HooksController &lt; ApplicationController
     end
   end
  
+  def test
+    @hook = @project.web_hooks.find(params[:id])
+    commits = @project.commits(@project.default_branch, nil, 3)
+    data = @project.web_hook_data(commits.last.id, commits.first.id, "refs/heads/#{@project.default_branch}")
+    @hook.execute(data)
+
+    redirect_to :back
+  end
+
   def show
     @hook = @project.web_hooks.find(params[:id])
   end
 = render "repositories/head"
-= debug @hook
+%h3= @hook.url
  
 - if can? current_user, :admin_project, @project
   .merge-tabs
+    = link_to 'Test Hook', test_project_hook_path(@project, @hook), :class => "grey-button"
     .right
       = link_to 'Remove', project_hook_path(@project, @hook), :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
@@ -85,7 +85,11 @@ Gitlab::Application.routes.draw do
     end
  
     resources :snippets
-    resources :hooks, :only => [:index, :new, :create, :destroy, :show]
+    resources :hooks, :only => [:index, :new, :create, :destroy, :show] do 
+      member do 
+        get :test
+      end
+    end
     resources :commits
     resources :team_members
     resources :issues do
...	...	@@ -0,0 +1,2 @@
	1	+web: bundle exec rails s -p $PORT
	2	+worker: bundle exec rake environment resque:work QUEUE=*
...	...
...	...	@@ -29,6 +29,15 @@ class HooksController < ApplicationController
29	29	end
30	30	end
31	31
	32	+ def test
	33	+ @hook = @project.web_hooks.find(params[:id])
	34	+ commits = @project.commits(@project.default_branch, nil, 3)
	35	+ data = @project.web_hook_data(commits.last.id, commits.first.id, "refs/heads/#{@project.default_branch}")
	36	+ @hook.execute(data)
	37	+
	38	+ redirect_to :back
	39	+ end
	40	+
32	41	def show
33	42	@hook = @project.web_hooks.find(params[:id])
34	43	end
...	...
1	1	= render "repositories/head"
2		-= debug @hook
	2	+%h3= @hook.url
3	3
4	4	- if can? current_user, :admin_project, @project
5	5	.merge-tabs
	6	+ = link_to 'Test Hook', test_project_hook_path(@project, @hook), :class => "grey-button"
6	7	.right
7	8	= link_to 'Remove', project_hook_path(@project, @hook), :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
...	...
...	...	@@ -85,7 +85,11 @@ Gitlab::Application.routes.draw do
85	85	end
86	86
87	87	resources :snippets
88		- resources :hooks, :only => [:index, :new, :create, :destroy, :show]
	88	+ resources :hooks, :only => [:index, :new, :create, :destroy, :show] do
	89	+ member do
	90	+ get :test
	91	+ end
	92	+ end
89	93	resources :commits
90	94	resources :team_members
91	95	resources :issues do
...	...