Procfile added. use foreman start to run gitlabhq

3-1-stable
Dmitriy Zaporozhets 2012-01-08 12:20:24 +02:00
parent 2d3b6375f3
commit 57ac5fe99f
5 changed files with 19 additions and 2 deletions

1
.foreman Normal file
View File

@ -0,0 +1 @@
port: 9999

2
Procfile Normal file
View File

@ -0,0 +1,2 @@
web: bundle exec rails s -p $PORT
worker: bundle exec rake environment resque:work QUEUE=*

View File

@ -29,6 +29,15 @@ class HooksController < 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

View File

@ -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 File

@ -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