Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
80e79f33
Commit
80e79f33
authored
Jan 08, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2516 from jouve/fix_json_exemples_in_help
fix exemple js data in help/web_hook
parents
aa97ff7f
0a0d2ecf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
39 deletions
+38
-39
app/views/hooks/_data_ex.html.erb
app/views/hooks/_data_ex.html.erb
+38
-39
No files found.
app/views/hooks/_data_ex.html.erb
View file @
80e79f33
<%
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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment