Software Publico / Gitlab

Commit 80e79f33aff57ba56838992591a13e086fad76b2

Authored by Dmitriy Zaporozhets 2013-01-08 23:43:43 -0800

Exists in master and in 4 other branches

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

  <% data_ex_str = <<eos
  {
--        :before => "95790bf891e76fee5e1747ab589903a6a1f80f22",
--         :after => "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
--           :ref => "refs/heads/master",
--       :user_id => 4,
--     :user_name => "John Smith",
--    :repository => {
--               :name => "Diaspora",
--                :url => "git@localhost:diaspora.git",
--        :description => "",
--           :homepage => "http://localhost/diaspora",
++  "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
++  "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
++  "ref": "refs/heads/master",
++  "user_id": 4,
++  "user_name": "John Smith",
++  "repository": {
++    "name": "Diaspora",
++    "url": "git@localhost:diaspora.git",
++    "description": "",
++    "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...",
--              :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)"
--            }
--        }
--    ],
--   total_commits_count => 4
--}
++    // ...
++    {
++      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
++      "message": "fixed readme",
++      "timestamp": "2012-01-03T23:36:29+02:00",
++      "url": "http://localhost/diaspora/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
++      "author": {
++        "name": "GitLab dev user",
++        "email": "gitlabdev@dv6700.(none)",
++      },
++    },
++  ],
++  "total_commits_count": 4,
++};
  eos
  %>
--<% js_lexer = Pygments::Lexer[:js] %>
--<%= raw js_lexer.highlight(data_ex_str) %>
++<div class="white">
++  <%= raw Pygments::Lexer[:js].highlight(data_ex_str) %>
++</div>