Permalink
Browse files

Procfile added. use foreman start to run gitlabhq

  • Loading branch information...
1 parent 2d3b637 commit 57ac5fe99fd7c870f1b408ccebbd01960f514636 @randx randx committed Jan 8, 2012
Showing with 19 additions and 2 deletions.
  1. +1 −0 .foreman
  2. +2 −0 Procfile
  3. +9 −0 app/controllers/hooks_controller.rb
  4. +2 −1 app/views/hooks/show.html.haml
  5. +5 −1 config/routes.rb
View
@@ -0,0 +1 @@
+port: 9999
View
@@ -0,0 +1,2 @@
+web: bundle exec rails s -p $PORT
+worker: bundle exec rake environment resque:work QUEUE=*
@@ -29,6 +29,15 @@ def create
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
@@ -1,7 +1,8 @@
= 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"
View
@@ -85,7 +85,11 @@
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 comments on commit 57ac5fe

Please sign in to comment.