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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
73404f62
Commit
73404f62
authored
Mar 26, 2012
by
Gosha Arinich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
there should be no space after '(' and before ')'
parent
39ea486e
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
18 additions
and
20 deletions
+18
-20
app/views/admin/mailer/preview.html.haml
app/views/admin/mailer/preview.html.haml
+1
-1
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+1
-1
app/views/commits/compare.html.haml
app/views/commits/compare.html.haml
+2
-2
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+3
-3
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+1
-1
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+1
-1
app/views/issues/create.js.haml
app/views/issues/create.js.haml
+1
-1
app/views/keys/create.js.haml
app/views/keys/create.js.haml
+1
-1
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-1
app/views/refs/_tree_file.html.haml
app/views/refs/_tree_file.html.haml
+4
-4
app/views/wikis/history.html.haml
app/views/wikis/history.html.haml
+2
-4
No files found.
app/views/admin/mailer/preview.html.haml
View file @
73404f62
...
@@ -25,4 +25,4 @@
...
@@ -25,4 +25,4 @@
:javascript
:javascript
$
(
function
()
{
$
(
function
()
{
$
(
"
#accordion
"
).
accordion
();
});
$
(
"
#accordion
"
).
accordion
();
});
app/views/admin/projects/show.html.haml
View file @
73404f62
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
%h3
%h3
Team
Team
%small
%small
(
#{
@admin_project
.
users_projects
.
count
}
)
(
#{
@admin_project
.
users_projects
.
count
}
)
%hr
%hr
...
...
app/views/commits/compare.html.haml
View file @
73404f62
...
@@ -36,12 +36,12 @@
...
@@ -36,12 +36,12 @@
$
(
function
()
{
$
(
function
()
{
var
availableTags
=
#{
@project
.
heads
.
map
(
&
:name
).
to_json
}
;
var
availableTags
=
#{
@project
.
heads
.
map
(
&
:name
).
to_json
}
;
$
(
"
#from
"
).
autocomplete
({
$
(
"
#from
"
).
autocomplete
({
source
:
availableTags
,
source
:
availableTags
,
minLength
:
1
minLength
:
1
});
});
$
(
"
#to
"
).
autocomplete
({
$
(
"
#to
"
).
autocomplete
({
source
:
availableTags
,
source
:
availableTags
,
minLength
:
1
minLength
:
1
});
});
...
...
app/views/dashboard/index.html.haml
View file @
73404f62
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%span
.ico.projects
%span
.ico.projects
=
link_to
"Projects"
,
"#projects"
,
:id
=>
"projects"
=
link_to
"Projects"
,
"#projects"
,
:id
=>
"projects"
%small
%small
(
most recent
)
(
most recent
)
%strong
.right
%strong
.right
=
link_to
projects_path
do
=
link_to
projects_path
do
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
%h3
%h3
=
link_to
"Merge Requests"
,
"#merge_requests"
,
:id
=>
"merge_requests"
=
link_to
"Merge Requests"
,
"#merge_requests"
,
:id
=>
"merge_requests"
%small
(
authored or assigned to you
)
%small
(
authored or assigned to you
)
%strong
.right
%strong
.right
=
link_to
dashboard_merge_requests_path
do
=
link_to
dashboard_merge_requests_path
do
Visit merge requests page
→
Visit merge requests page
→
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
%div
.dashboard_category
%div
.dashboard_category
%h3
%h3
=
link_to
"Issues"
,
"#issues"
,
:id
=>
"issues"
=
link_to
"Issues"
,
"#issues"
,
:id
=>
"issues"
%small
(
assigned to you
)
%small
(
assigned to you
)
%strong
.right
%strong
.right
=
link_to
dashboard_issues_path
do
=
link_to
dashboard_issues_path
do
Visit issues page
→
Visit issues page
→
...
...
app/views/dashboard/issues.html.haml
View file @
73404f62
%h3
%h3
Issues
Issues
%small
(
assigned to you
)
%small
(
assigned to you
)
%br
%br
-
if
@issues
.
any?
-
if
@issues
.
any?
...
...
app/views/dashboard/merge_requests.html.haml
View file @
73404f62
%h3
%h3
Merge Requests
Merge Requests
%small
(
authored or assigned to you
)
%small
(
authored or assigned to you
)
%br
%br
-
if
@merge_requests
.
any?
-
if
@merge_requests
.
any?
...
...
app/views/issues/create.js.haml
View file @
73404f62
-
if
@issue
.
valid?
-
if
@issue
.
valid?
:plain
:plain
switchFromNewIssue();
switchFromNewIssue();
$("#issues-table").prepend("
#{
escape_javascript
(
render
(
:partial
=>
'show'
,
:locals
=>
{
:issue
=>
@issue
}
))
}
");
$("#issues-table").prepend("
#{
escape_javascript
(
render
(
:partial
=>
'show'
,
:locals
=>
{
:issue
=>
@issue
}))
}
");
$.ajax({type: "GET", url: location.href, dataType: "script"});
$.ajax({type: "GET", url: location.href, dataType: "script"});
-
else
-
else
:plain
:plain
...
...
app/views/keys/create.js.haml
View file @
73404f62
-
if
@key
.
valid?
-
if
@key
.
valid?
:plain
:plain
$("#new_key_dialog").dialog("close");
$("#new_key_dialog").dialog("close");
$("#keys-table .data").append("
#{
escape_javascript
(
render
(
:partial
=>
'show'
,
:locals
=>
{
:key
=>
@key
}
))
}
");
$("#keys-table .data").append("
#{
escape_javascript
(
render
(
:partial
=>
'show'
,
:locals
=>
{
:key
=>
@key
}))
}
");
$("#no_ssh_key_defined").hide();
$("#no_ssh_key_defined").hide();
-
else
-
else
:plain
:plain
...
...
app/views/layouts/_head_panel.html.haml
View file @
73404f62
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
});
});
$
(
document
).
keypress
(
function
(
e
)
{
$
(
document
).
keypress
(
function
(
e
)
{
if
(
$
(
e
.
target
).
is
(
"
:input
"
)
)
return
;
if
(
$
(
e
.
target
).
is
(
"
:input
"
)
)
return
;
switch
(
e
.
which
)
{
switch
(
e
.
which
)
{
case
115
:
focusSearch
();
case
115
:
focusSearch
();
e
.
preventDefault
();
e
.
preventDefault
();
...
...
app/views/refs/_tree_file.html.haml
View file @
73404f62
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
.view_file
.view_file
.view_file_header
.view_file_header
.row
.row
.span1.file_icon
=
image_tag
(
file
.
image?
?
"file_img.png"
:
"file_txt.png"
)
.span1.file_icon
=
image_tag
(
file
.
image?
?
"file_img.png"
:
"file_txt.png"
)
.span2.mode_text
=
file
.
mode
.span2.mode_text
=
file
.
mode
.span7.file_name
=
name
.span7.file_name
=
name
.span4.right
.span4.right
=
link_to
"raw"
,
blob_project_ref_path
(
@project
,
@ref
,
:path
=>
params
[
:path
]
),
:class
=>
"right"
,
:target
=>
"_blank"
=
link_to
"raw"
,
blob_project_ref_path
(
@project
,
@ref
,
:path
=>
params
[
:path
]),
:class
=>
"right"
,
:target
=>
"_blank"
=
link_to
"history"
,
project_commits_path
(
@project
,
:path
=>
params
[
:path
],
:ref
=>
@ref
),
:class
=>
"right"
,
:style
=>
"margin-right:10px;"
=
link_to
"history"
,
project_commits_path
(
@project
,
:path
=>
params
[
:path
],
:ref
=>
@ref
),
:class
=>
"right"
,
:style
=>
"margin-right:10px;"
-
if
file
.
text?
-
if
file
.
text?
.view_file_content
.view_file_content
-
unless
file
.
empty?
-
unless
file
.
empty?
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
%img
{
:src
=>
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
%img
{
:src
=>
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
-
else
-
else
%center
%center
=
link_to
blob_project_ref_path
(
@project
,
@ref
,
:path
=>
params
[
:path
]
)
do
=
link_to
blob_project_ref_path
(
@project
,
@ref
,
:path
=>
params
[
:path
])
do
%div
%div
%br
%br
=
image_tag
"download.png"
,
:width
=>
64
=
image_tag
"download.png"
,
:width
=>
64
...
...
app/views/wikis/history.html.haml
View file @
73404f62
...
@@ -11,9 +11,7 @@
...
@@ -11,9 +11,7 @@
%td
=
i
+
1
%td
=
i
+
1
%td
%td
=
link_to
wiki_page
.
created_at
.
to_s
(
:short
),
project_wiki_path
(
@project
,
wiki_page
,
:old_page_id
=>
wiki_page
.
id
)
=
link_to
wiki_page
.
created_at
.
to_s
(
:short
),
project_wiki_path
(
@project
,
wiki_page
,
:old_page_id
=>
wiki_page
.
id
)
(
(
#{
time_ago_in_words
(
wiki_page
.
created_at
)
}
=
time_ago_in_words
(
wiki_page
.
created_at
)
ago)
ago
)
%td
=
wiki_page
.
user
.
name
%td
=
wiki_page
.
user
.
name
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