deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2516 from jouve/fix_json_exemples_in_help

Browse source 
fix exemple js data in help/web_hook
This commit is contained in:
Dmitriy Zaporozhets 2013-01-08 23:43:43 -08:00
parent aa97ff7fde 0a0d2ecf85
commit 80e79f33af
1 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
app/views/hooks/_data_ex.html.erb
View file

@ -1,44 +1,43 @@
<% data_ex_str = <<eos <% data_ex_str = <<eos
{ {
:before => "95790bf891e76fee5e1747ab589903a6a1f80f22", "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
:after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
:ref => "refs/heads/master", "ref": "refs/heads/master",
:user_id => 4, "user_id": 4,
:user_name => "John Smith", "user_name": "John Smith",
:repository => { "repository": {
:name => "Diaspora", "name": "Diaspora",
:url => "git@localhost:diaspora.git", "url": "git@localhost:diaspora.git",
:description => "", "description": "",
:homepage => "http://localhost/diaspora", "homepage": "http://localhost/diaspora",
},
"commits": [
{
"id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
"message": "Update Catalan translation to e38cb41.",
"timestamp": "2011-12-12T14:27:31+02:00",
"url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
"author": {
"name": "Jordi Mallach",
"email": "jordi@softcatala.org",
}
}, },
:commits => [ // ...
[0] { {
:id => "450d0de7532f8b663b9c5cce183b...", "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
:message => "Update Catalan translation to e38cb41.", "message": "fixed readme",
:timestamp => "2011-12-12T14:27:31+02:00", "timestamp": "2012-01-03T23:36:29+02:00",
:url => "http://localhost/diaspora/commits/450d0de7532f...", "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
:author => { "author": {
:name => "Jordi Mallach", "name": "GitLab dev user",
:email => "jordi@softcatala.org" "email": "gitlabdev@dv6700.(none)",
} },
}, },
],
.... "total_commits_count": 4,
};
[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)"
}
}
],
total_commits_count => 4
}
eos eos
%> %>
<% js_lexer = Pygments::Lexer[:js] %> <div class="white">
<%= raw js_lexer.highlight(data_ex_str) %> <%= raw Pygments::Lexer[:js].highlight(data_ex_str) %>
</div>