Commit 473445c7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

complete hooks for post receive

parent 57ac5fe9
port: 9999 port: 3000
...@@ -68,7 +68,7 @@ class ProjectsController < ApplicationController ...@@ -68,7 +68,7 @@ class ProjectsController < ApplicationController
def show def show
return render "projects/empty" unless @project.repo_exists? && @project.has_commits? return render "projects/empty" unless @project.repo_exists? && @project.has_commits?
limit = (params[:limit] || 10).to_i limit = (params[:limit] || 20).to_i
@activities = @project.cached_updates(limit) @activities = @project.cached_updates(limit)
end end
......
...@@ -9,7 +9,7 @@ class RepositoriesController < ApplicationController ...@@ -9,7 +9,7 @@ class RepositoriesController < ApplicationController
layout "project" layout "project"
def show def show
@activities = @project.fresh_commits(10) @activities = @project.fresh_commits(20)
end end
def branches def branches
......
<% data_ex_str = <<eos
{
:before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
:after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
:ref => "refs/heads/master",
:repository => {
:name => "Diaspora",
:url => "localhost/diaspora",
:description => "",
:homepage => "localhost/diaspora",
:private => true
},
:commits => [
[0] {
:id => "450d0de7532f8b663b9c5cce183b...",
:message => "Update Catalan translation to e38cb41.",
:timestamp => "2011-12-12T14:27:31+02:00",
:url => "http://localhost/diaspora/commits/450d0de7532f...",
:author => {
:name => "Jordi Mallach",
:email => "jordi@softcatala.org"
}
},
....
[3] {
:id => "da1560886d4f094c3e6c9ef40349...",
:message => "fixed readme",
:timestamp => "2012-01-03T23:36:29+02:00",
:url => "http://localhost/diaspora/commits/da1560886d...",
:author => {
:name => "gitlab dev user",
:email => "gitlabdev@dv6700.(none)"
}
}
]
}
eos
%>
<% js_lexer = Pygments::Lexer[:js] %>
<%= raw js_lexer.highlight(data_ex_str) %>
= render "repositories/head" = render "repositories/head"
.right= link_to "Add new", new_project_hook_path(@project), :class => "grey-button append-bottom-10" .right= link_to "Add new", new_project_hook_path(@project), :class => "grey-button append-bottom-10"
- unless @hooks.empty? - unless @hooks.empty?
%div.update-data.ui-box.ui-box-small %div.update-data.ui-box.ui-box-small
...@@ -14,3 +18,13 @@ ...@@ -14,3 +18,13 @@
- else - else
%h3 No hooks %h3 No hooks
.clear
%h3 Help
%p
Post receive hooks. For now only POST request allowed. We send some data with request. Example below
.view_file
.view_file_header
%strong POST data passed
.data.no-padding
= render "data_ex"
= render "repositories/head" = render "repositories/head"
%h3= @hook.url %h3
%span.commit.tag POST
= @hook.url
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
.merge-tabs .merge-tabs
......
...@@ -20,6 +20,6 @@ test: ...@@ -20,6 +20,6 @@ test:
production: production:
adapter: sqlite3 adapter: sqlite3
database: db/production.sqlite3 database: db/development.sqlite3
pool: 5 pool: 5
timeout: 5000 timeout: 5000
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment