Download as
Browse Code »

Commit 80e79f33aff57ba56838992591a13e086fad76b2

Authored by Dmitriy Zaporozhets
2 parents aa97ff7f 0a0d2ecf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2516 from jouve/fix_json_exemples_in_help 

fix exemple js data in help/web_hook
Showing 1 changed file with 38 additions and 39 deletions   Show diff stats
app/views/hooks/_data_ex.html.erb
  Diff comments   View file @80e79f3
1 1 <% data_ex_str = <<eos
2 2 {
3   - :before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
4   - :after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
5   - :ref => "refs/heads/master",
6   - :user_id => 4,
7   - :user_name => "John Smith",
8   - :repository => {
9   - :name => "Diaspora",
10   - :url => "git@localhost:diaspora.git",
11   - :description => "",
12   - :homepage => "http://localhost/diaspora",
  3 + "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
  4 + "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
  5 + "ref": "refs/heads/master",
  6 + "user_id": 4,
  7 + "user_name": "John Smith",
  8 + "repository": {
  9 + "name": "Diaspora",
  10 + "url": "git@localhost:diaspora.git",
  11 + "description": "",
  12 + "homepage": "http://localhost/diaspora",
  13 + },
  14 + "commits": [
  15 + {
  16 + "id": "b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
  17 + "message": "Update Catalan translation to e38cb41.",
  18 + "timestamp": "2011-12-12T14:27:31+02:00",
  19 + "url": "http://localhost/diaspora/commits/b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327",
  20 + "author": {
  21 + "name": "Jordi Mallach",
  22 + "email": "jordi@softcatala.org",
  23 + }
13 24 },
14   - :commits => [
15   - [0] {
16   - :id => "450d0de7532f8b663b9c5cce183b...",
17   - :message => "Update Catalan translation to e38cb41.",
18   - :timestamp => "2011-12-12T14:27:31+02:00",
19   - :url => "http://localhost/diaspora/commits/450d0de7532f...",
20   - :author => {
21   - :name => "Jordi Mallach",
22   - :email => "jordi@softcatala.org"
23   - }
24   - },
25   -
26   - ....
27   -
28   - [3] {
29   - :id => "da1560886d4f094c3e6c9ef40349...",
30   - :message => "fixed readme",
31   - :timestamp => "2012-01-03T23:36:29+02:00",
32   - :url => "http://localhost/diaspora/commits/da1560886d...",
33   - :author => {
34   - :name => "GitLab dev user",
35   - :email => "gitlabdev@dv6700.(none)"
36   - }
37   - }
38   - ],
39   - total_commits_count => 4
40   -}
  25 + // ...
  26 + {
  27 + "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
  28 + "message": "fixed readme",
  29 + "timestamp": "2012-01-03T23:36:29+02:00",
  30 + "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
  31 + "author": {
  32 + "name": "GitLab dev user",
  33 + "email": "gitlabdev@dv6700.(none)",
  34 + },
  35 + },
  36 + ],
  37 + "total_commits_count": 4,
  38 +};
41 39 eos
42 40 %>
43   -<% js_lexer = Pygments::Lexer[:js] %>
44   -<%= raw js_lexer.highlight(data_ex_str) %>
  41 +<div class="white">
  42 + <%= raw Pygments::Lexer[:js].highlight(data_ex_str) %>
  43 +</div>
... ...