Download as
Browse Code »

Commit f45345edb33f1129aabb58976ae2e6812387eb7d

Authored by Dmitriy Zaporozhets
1 parent a16533a0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds

Showing 2 changed files with 17 additions and 8 deletions   Show diff stats
app/controllers/admin/projects_controller.rb
  Diff comments   View file @f45345e
@@ -35,6 +35,9 @@ class Admin::ProjectsController < AdminController @@ -35,6 +35,9 @@ class Admin::ProjectsController < AdminController
35 end 35 end
36 36
37 def destroy 37 def destroy
  38 + # Delete team first in order to prevent multiple gitolite calls
  39 + @project.truncate_team
  40 +
38 @project.destroy 41 @project.destroy
39 42
40 redirect_to admin_projects_path, notice: 'Project was successfully deleted.' 43 redirect_to admin_projects_path, notice: 'Project was successfully deleted.'
db/fixtures/development/010_keys.rb
  Diff comments   View file @f45345e
1 -Key.seed(:id, [  
2 - {  
3 - id: 1,  
4 - title: "Sample key",  
5 - key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt4596k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",  
6 - user_id: 1,  
7 - }  
8 -]) 1 +
  2 +Gitlab::Seeder.quiet do
  3 + User.first(30).each_with_index do |user, i|
  4 + Key.seed(:id, [
  5 + {
  6 + id: i,
  7 + title: "Sample key #{i}",
  8 + key: "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAIEAiPWx6WM4lhHNedGfBpPJNPpZ7yKu+dnn1SJejgt#{i + 100}6k6YjzGGphH2TUxwKzxcKDKKezwkpfnxPkSMkuEspGRt/aZZ9wa++Oi7Qkr8prgHc4soW6NUlfDzpvZK2H5E7eQaSeP3SAwGmQKUFHCddNaP0L+hM7zhFNzjFvpaMgJw0=",
  9 + user_id: user.id,
  10 + }
  11 + ])
  12 + puts "SSH KEY ##{i} added.".green
  13 + end
  14 +end