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
f45345ed
Commit
f45345ed
authored
Dec 30, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds
parent
a16533a0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+3
-0
db/fixtures/development/010_keys.rb
db/fixtures/development/010_keys.rb
+14
-8
No files found.
app/controllers/admin/projects_controller.rb
View file @
f45345ed
...
@@ -35,6 +35,9 @@ class Admin::ProjectsController < AdminController
...
@@ -35,6 +35,9 @@ class Admin::ProjectsController < AdminController
end
end
def
destroy
def
destroy
# Delete team first in order to prevent multiple gitolite calls
@project
.
truncate_team
@project
.
destroy
@project
.
destroy
redirect_to
admin_projects_path
,
notice:
'Project was successfully deleted.'
redirect_to
admin_projects_path
,
notice:
'Project was successfully deleted.'
...
...
db/fixtures/development/010_keys.rb
View file @
f45345ed
Key
.
seed
(
:id
,
[
Gitlab
::
Seeder
.
quiet
do
User
.
first
(
30
).
each_with_index
do
|
user
,
i
|
Key
.
seed
(
:id
,
[
{
{
id:
1
,
id:
i
,
title:
"Sample key
"
,
title:
"Sample key
#{
i
}
"
,
key:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt459
6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
key:
"ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt
#{
i
+
100
}
6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0="
,
user_id:
1
,
user_id:
user
.
id
,
}
}
])
])
puts
"SSH KEY #
#{
i
}
added."
.
green
end
end
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