Merge branch 'ce_upstrem_import-url-fix' into 'ce-upstream'

merge import URL fix from CE to EE

See merge request !344

app/models/project.rb

@@ -90,7 +90,8 @@ class Project < ActiveRecord::Base
   after_destroy :remove_pages
 
   after_update :update_forks_visibility_level
-  after_update :remove_mirror_repository_reference, if: :import_url_changed?
+  after_update :remove_mirror_repository_reference,
+               if: ->(project) { project.mirror? && project.import_url_updated? }
 
   ActsAsTaggableOn.strict_case_match = true
   acts_as_taggable_on :tags
@@ -1249,6 +1250,11 @@ class Project < ActiveRecord::Base
     self.merge_requests_ff_only_enabled || self.merge_requests_rebase_enabled
   end
 
+  def import_url_updated?
+    # check if import_url has been updated and it's not just the first assignment
+    import_url_changed? && changes['import_url'].first
+  end
+
   private
 
   def update_forks_visibility_level

db/schema.rb

@@ -808,8 +808,8 @@ ActiveRecord::Schema.define(version: 20160414064845) do
     t.integer "project_id"
     t.text    "data"
     t.text    "encrypted_credentials"
-    t.text    "encrypted_credentials_iv"
-    t.text    "encrypted_credentials_salt"
+    t.string  "encrypted_credentials_iv"
+    t.string  "encrypted_credentials_salt"
   end
 
   create_table "projects", force: :cascade do |t|