From 473445c76fe6d99243a0e6b0247bc79cc47c3e44 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 8 Jan 2012 13:20:20 +0200
Subject: [PATCH] complete hooks for post receive
---
.foreman | 2 +-
app/controllers/projects_controller.rb | 2 +-
app/controllers/repositories_controller.rb | 2 +-
app/views/hooks/_data_ex.html.erb | 42 ++++++++++++++++++++++
app/views/hooks/index.html.haml | 14 ++++++++
app/views/hooks/show.html.haml | 5 ++-
config/database.yml | 2 +-
7 files changed, 64 insertions(+), 5 deletions(-)
create mode 100644 app/views/hooks/_data_ex.html.erb
diff --git a/.foreman b/.foreman
index 549e85b1490..87c3f5a1c15 100644
--- a/.foreman
+++ b/.foreman
@@ -1 +1 @@
-port: 9999
+port: 3000
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 29fcb52eb97..1e859ceac31 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -68,7 +68,7 @@ class ProjectsController < ApplicationController
def show
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)
end
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c0652cbeab9..9a112f4674f 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -9,7 +9,7 @@ class RepositoriesController < ApplicationController
layout "project"
def show
- @activities = @project.fresh_commits(10)
+ @activities = @project.fresh_commits(20)
end
def branches
diff --git a/app/views/hooks/_data_ex.html.erb b/app/views/hooks/_data_ex.html.erb
new file mode 100644
index 00000000000..f212bb2dc0b
--- /dev/null
+++ b/app/views/hooks/_data_ex.html.erb
@@ -0,0 +1,42 @@
+<% 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) %>
diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml
index b0795ad4b2f..e149f4fc767 100644
--- a/app/views/hooks/index.html.haml
+++ b/app/views/hooks/index.html.haml
@@ -1,4 +1,8 @@
= render "repositories/head"
+
+
+
+
.right= link_to "Add new", new_project_hook_path(@project), :class => "grey-button append-bottom-10"
- unless @hooks.empty?
%div.update-data.ui-box.ui-box-small
@@ -14,3 +18,13 @@
- else
%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"
diff --git a/app/views/hooks/show.html.haml b/app/views/hooks/show.html.haml
index 6bc1132de27..47c1ddeac40 100644
--- a/app/views/hooks/show.html.haml
+++ b/app/views/hooks/show.html.haml
@@ -1,5 +1,8 @@
= render "repositories/head"
-%h3= @hook.url
+%h3
+ %span.commit.tag POST
+ = @hook.url
+
- if can? current_user, :admin_project, @project
.merge-tabs
diff --git a/config/database.yml b/config/database.yml
index 51a4dd459dc..ff126d9ce70 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -20,6 +20,6 @@ test:
production:
adapter: sqlite3
- database: db/production.sqlite3
+ database: db/development.sqlite3
pool: 5
timeout: 5000
--
GitLab