diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-30 14:09:43 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-30 14:09:43 +0200 |
| commit | f45345edb33f1129aabb58976ae2e6812387eb7d (patch) | |
| tree | 031e1a85de204d38c528431be728cf1ca150a1ff | |
| parent | a16533a04a3033772bdde2616ce812a3247e6fb5 (diff) | |
| download | gitlab-ce-f45345edb33f1129aabb58976ae2e6812387eb7d.tar.gz | |
Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds
| -rw-r--r-- | app/controllers/admin/projects_controller.rb | 3 | ||||
| -rw-r--r-- | db/fixtures/development/010_keys.rb | 22 |
2 files changed, 17 insertions, 8 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 4fea8709b70..e1982eee577 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -35,6 +35,9 @@ class Admin::ProjectsController < AdminController end def destroy + # Delete team first in order to prevent multiple gitolite calls + @project.truncate_team + @project.destroy redirect_to admin_projects_path, notice: 'Project was successfully deleted.' diff --git a/db/fixtures/development/010_keys.rb b/db/fixtures/development/010_keys.rb index d17e73db56b..8e4724c277c 100644 --- a/db/fixtures/development/010_keys.rb +++ b/db/fixtures/development/010_keys.rb @@ -1,8 +1,14 @@ -Key.seed(:id, [ - { - id: 1, - title: "Sample key", - key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=", - user_id: 1, - } -]) + +Gitlab::Seeder.quiet do + User.first(30).each_with_index do |user, i| + Key.seed(:id, [ + { + id: i, + title: "Sample key #{i}", + key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt#{i + 100}6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=", + user_id: user.id, + } + ]) + puts "SSH KEY ##{i} added.".green + end +end |