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
37771eb4
Commit
37771eb4
authored
Jan 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/pager_load' of dev.gitlabhq.com:gitlab/gitlabhq
parents
eadad855
dd20da1b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
24 deletions
+4
-24
app/assets/javascripts/dashboard.js.coffee
app/assets/javascripts/dashboard.js.coffee
+1
-4
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+3
-0
app/views/keys/create.js.haml
app/views/keys/create.js.haml
+0
-9
app/views/keys/new.js.haml
app/views/keys/new.js.haml
+0
-11
No files found.
app/assets/javascripts/dashboard.js.coffee
View file @
37771eb4
$
->
window
.
dashboardPage
=
->
dashboardPage
()
dashboardPage
=
->
Pager
.
init
20
,
true
Pager
.
init
20
,
true
$
(
".event_filter_link"
).
bind
"click"
,
(
event
)
->
$
(
".event_filter_link"
).
bind
"click"
,
(
event
)
->
event
.
preventDefault
()
event
.
preventDefault
()
...
...
app/views/dashboard/index.html.haml
View file @
37771eb4
...
@@ -7,3 +7,6 @@
...
@@ -7,3 +7,6 @@
-
else
-
else
=
render
"zero_authorized_projects"
=
render
"zero_authorized_projects"
:javascript
dashboardPage
();
app/views/keys/create.js.haml
deleted
100644 → 0
View file @
eadad855
-
if
@key
.
valid?
:plain
$("#new_key_dialog").dialog("close");
$("#keys-table .data").append("
#{
escape_javascript
(
render
(
partial:
'show'
,
locals:
{
key:
@key
}))
}
");
$("#no_ssh_key_defined").hide();
-
else
:plain
$("#new_key_dialog").empty();
$("#new_key_dialog").append("
#{
escape_javascript
(
render
(
'form'
))
}
");
app/views/keys/new.js.haml
deleted
100644 → 0
View file @
eadad855
:plain
var new_key_dialog = $("<div id='new_key_dialog'></div>");
new_key_dialog.html("
#{
escape_javascript
(
render
(
'form'
))
}
");
$(new_key_dialog).dialog({
width: 350,
resizable: false,
draggable: false,
title: "Add new public key",
close: function(event, ui) { $("#new_key_dialog").remove();},
modal: true
});
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