Download as
Browse Code »

Commit e7c930a55b9832a767bfb1a5e2a8add8f9e719f9

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

Add imported boolean to project. Prevent shell from creating repo after it was imported

Showing 6 changed files with 21 additions and 10 deletions   Show diff stats
app/contexts/projects/create_context.rb
  Diff comments   View file @e7c930a
... ... @@ -51,6 +51,7 @@ module Projects
51 51 if shell.import_repository(@project.path_with_namespace, @project.import_url)
52 52 # We should create satellite for imported repo
53 53 @project.satellite.create unless @project.satellite.exists?
  54 + @project.imported = true
54 55 true
55 56 else
56 57 @project.errors.add(:import_url, 'cannot clone repo')
... ...
app/helpers/application_helper.rb
  Diff comments   View file @e7c930a
... ... @@ -142,7 +142,7 @@ module ApplicationHelper
142 142 end
143 143  
144 144 def user_color_scheme_class
145   - COLOR_SCHEMES[current_user.try(:color_scheme_id)]
  145 + COLOR_SCHEMES[current_user.try(:color_scheme_id)] if defined?(current_user)
146 146 end
147 147  
148 148 # Define whenever show last push event
... ...
app/models/project.rb
  Diff comments   View file @e7c930a
... ... @@ -413,6 +413,10 @@ class Project < ActiveRecord::Base
413 413 !(forked_project_link.nil? || forked_project_link.forked_from_project.nil?)
414 414 end
415 415  
  416 + def imported?
  417 + imported
  418 + end
  419 +
416 420 def rename_repo
417 421 old_path_with_namespace = File.join(namespace_dir, path_was)
418 422 new_path_with_namespace = File.join(namespace_dir, path)
... ...
app/observers/project_observer.rb
  Diff comments   View file @e7c930a
1 1 class ProjectObserver < BaseObserver
2 2 def after_create(project)
3   - unless project.forked?
4   - GitlabShellWorker.perform_async(
5   - :add_repository,
6   - project.path_with_namespace
7   - )
8   -
9   - log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
10   - end
  3 + return true if project.forked? || project.imported?
  4 +
  5 + GitlabShellWorker.perform_async(
  6 + :add_repository,
  7 + project.path_with_namespace
  8 + )
  9 +
  10 + log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
11 11 end
12 12  
13 13 def after_update(project)
... ...
db/migrate/20130614132337_add_improted_to_project.rb 0 → 100644
  Diff comments   View file @e7c930a
... ... @@ -0,0 +1,5 @@
  1 +class AddImprotedToProject < ActiveRecord::Migration
  2 + def change
  3 + add_column :projects, :imported, :boolean, default: false, null: false
  4 + end
  5 +end
... ...
db/schema.rb
  Diff comments   View file @e7c930a
... ... @@ -11,7 +11,7 @@
11 11 #
12 12 # It's strongly recommended to check this file into your version control system.
13 13  
14   -ActiveRecord::Schema.define(:version => 20130613173246) do
  14 +ActiveRecord::Schema.define(:version => 20130614132337) do
15 15  
16 16 create_table "deploy_keys_projects", :force => true do |t|
17 17 t.integer "deploy_key_id", :null => false
... ... @@ -172,6 +172,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130613173246) do
172 172 t.string "issues_tracker_id"
173 173 t.boolean "snippets_enabled", :default => true, :null => false
174 174 t.datetime "last_activity_at"
  175 + t.boolean "imported", :default => false, :null => false
175 176 end
176 177  
177 178 add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id"
... ...