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
Kazuhiko Shiozaki
gitlab-ce
Commits
f1c534c6
Commit
f1c534c6
authored
12 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
parents
dfe9f367
fc49b201
Changes
11
Show 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 @
f1c534c6
...
...
@@ -25,4 +25,4 @@
:javascript
$
(
function
()
{
$
(
"
#accordion
"
).
accordion
();
});
$
(
"
#accordion
"
).
accordion
();
});
This diff is collapsed.
Click to expand it.
app/views/admin/projects/show.html.haml
View file @
f1c534c6
...
...
@@ -36,7 +36,7 @@
%h3
Team
%small
(
#{
@admin_project
.
users_projects
.
count
}
)
(
#{
@admin_project
.
users_projects
.
count
}
)
%hr
...
...
This diff is collapsed.
Click to expand it.
app/views/commits/compare.html.haml
View file @
f1c534c6
...
...
@@ -36,12 +36,12 @@
$
(
function
()
{
var
availableTags
=
#{
@project
.
heads
.
map
(
&
:name
).
to_json
}
;
$
(
"
#from
"
).
autocomplete
({
$
(
"
#from
"
).
autocomplete
({
source
:
availableTags
,
minLength
:
1
});
$
(
"
#to
"
).
autocomplete
({
$
(
"
#to
"
).
autocomplete
({
source
:
availableTags
,
minLength
:
1
});
...
...
This diff is collapsed.
Click to expand it.
app/views/dashboard/index.html.haml
View file @
f1c534c6
...
...
@@ -11,7 +11,7 @@
%span
.ico.projects
=
link_to
"Projects"
,
"#projects"
,
:id
=>
"projects"
%small
(
most recent
)
(
most recent
)
%strong
.right
=
link_to
projects_path
do
...
...
@@ -55,7 +55,7 @@
%h3
=
link_to
"Merge Requests"
,
"#merge_requests"
,
:id
=>
"merge_requests"
%small
(
authored or assigned to you
)
%small
(
authored or assigned to you
)
%strong
.right
=
link_to
dashboard_merge_requests_path
do
Visit merge requests page
→
...
...
@@ -67,7 +67,7 @@
%div
.dashboard_category
%h3
=
link_to
"Issues"
,
"#issues"
,
:id
=>
"issues"
%small
(
assigned to you
)
%small
(
assigned to you
)
%strong
.right
=
link_to
dashboard_issues_path
do
Visit issues page
→
...
...
This diff is collapsed.
Click to expand it.
app/views/dashboard/issues.html.haml
View file @
f1c534c6
%h3
Issues
%small
(
assigned to you
)
%small
(
assigned to you
)
%br
-
if
@issues
.
any?
...
...
This diff is collapsed.
Click to expand it.
app/views/dashboard/merge_requests.html.haml
View file @
f1c534c6
%h3
Merge Requests
%small
(
authored or assigned to you
)
%small
(
authored or assigned to you
)
%br
-
if
@merge_requests
.
any?
...
...
This diff is collapsed.
Click to expand it.
app/views/issues/create.js.haml
View file @
f1c534c6
-
if
@issue
.
valid?
:plain
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"});
-
else
:plain
...
...
This diff is collapsed.
Click to expand it.
app/views/keys/create.js.haml
View file @
f1c534c6
-
if
@key
.
valid?
:plain
$("#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();
-
else
:plain
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/_head_panel.html.haml
View file @
f1c534c6
...
...
@@ -29,7 +29,7 @@
});
$
(
document
).
keypress
(
function
(
e
)
{
if
(
$
(
e
.
target
).
is
(
"
:input
"
)
)
return
;
if
(
$
(
e
.
target
).
is
(
"
:input
"
)
)
return
;
switch
(
e
.
which
)
{
case
115
:
focusSearch
();
e
.
preventDefault
();
...
...
This diff is collapsed.
Click to expand it.
app/views/refs/_tree_file.html.haml
View file @
f1c534c6
...
...
@@ -2,12 +2,12 @@
.view_file
.view_file_header
.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
.span7.file_name
=
name
.span4.right
=
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
"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;"
-
if
file
.
text?
.view_file_content
-
unless
file
.
empty?
...
...
@@ -22,7 +22,7 @@
%img
{
:src
=>
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
-
else
%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
%br
=
image_tag
"download.png"
,
:width
=>
64
...
...
This diff is collapsed.
Click to expand it.
app/views/wikis/history.html.haml
View file @
f1c534c6
...
...
@@ -11,9 +11,7 @@
%td
=
i
+
1
%td
=
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
)
ago
)
(
#{
time_ago_in_words
(
wiki_page
.
created_at
)
}
ago)
%td
=
wiki_page
.
user
.
name
This diff is collapsed.
Click to expand it.
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