Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-08 13:28:27 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-08 13:28:27 +0400
commitc147b571f4dbb6a6c6b104173f91c3a94f5be0f9 (patch)
treed89ceb4853a72368e4e2fadd45070300845fb6eb /app/views/admin/hooks
parent5cf31b92c4b56f9526b8557a78a59944a4a47bb4 (diff)
parent9a0329016b010d2882534309e96ead8b84418c3c (diff)
Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'app/views/admin/hooks')
-rw-r--r--app/views/admin/hooks/_data_ex.html.erb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/admin/hooks/_data_ex.html.erb b/app/views/admin/hooks/_data_ex.html.erb
index b69aa92716d..5b16dfb398a 100644
--- a/app/views/admin/hooks/_data_ex.html.erb
+++ b/app/views/admin/hooks/_data_ex.html.erb
@@ -52,7 +52,8 @@
"created_at": "2012-07-21T07:44:07Z",
"email": "js@gitlabhq.com",
"event_name": "user_create",
- "name": "John Smith"
+ "name": "John Smith",
+ "user_id": 41
}
6. User removed:
@@ -60,7 +61,8 @@
"created_at": "2012-07-21T07:44:07Z",
"email": "js@gitlabhq.com",
"event_name": "user_destroy",
- "name": "John Smith"
+ "name": "John Smith",
+ "user_id": 41
}
eos