Merge remote-tracking branch 'upstream/release/4.0' into dev

Conflicts:
	app/views/users/_form.html.erb
	db/seeds/development.rb
	lib/open_project/configuration.rb
	lib/open_project/configuration/helpers.rb
	test/functional/repositories_filesystem_controller_test.rb

db/seeds/development.rb

@@ -107,10 +107,29 @@ time_entry_activities = []
   time_entry_activities << time_entry_activity
 end
 
-Setting.enabled_scm = Setting.enabled_scm.dup << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
+repo_url_setting = OpenProject::Configuration['scm_filesystem_path_whitelist']
+repository = if repo_url_setting.empty?
+               puts <<-MESSAGE
+* = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + =
 
-repository = Repository::Filesystem.create! project: project,
+Filesystem based repositories are not configured. No repository and no changeset will be created.
-                                            url: Faker::Internet.url
+
+In case you want those, define whitelisted repositories in your configuration.yml.
+See config/configuration.yml.example for details.
+
+* = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + = * = + =
+
+               MESSAGE
+
+               nil
+             else
+               Setting.enabled_scm = (Setting.enabled_scm.dup << 'Filesystem').uniq
+
+               repo_url = Dir.glob(repo_url_setting).first
+
+               Repository::Filesystem.create! project: project,
+                                              url: repo_url
+             end
 
 print 'Creating objects for...'
 user_count.times do |count|
@@ -160,39 +179,41 @@ user_count.times do |count|
 
     ## add changesets
 
-    2.times do |changeset_count|
+    if repository
-      print '.'
+      2.times do |changeset_count|
-      changeset = Changeset.create(repository: repository,
-                                   user: user,
-                                   revision: issue.id * 10 + changeset_count,
-                                   scmid: issue.id * 10 + changeset_count,
-                                   user: user,
-                                   work_packages: [issue],
-                                   committer: Faker::Name.name,
-                                   committed_on: Date.today,
-                                   comments: Faker::Lorem.words(8).join(' '))
-
-      5.times do
         print '.'
-        change = Change.create(action: Faker::Lorem.characters(1),
+        changeset = Changeset.create(repository: repository,
-                               path: Faker::Internet.url)
+                                     user: user,
+                                     revision: issue.id * 10 + changeset_count,
+                                     scmid: issue.id * 10 + changeset_count,
+                                     user: user,
+                                     work_packages: [issue],
+                                     committer: Faker::Name.name,
+                                     committed_on: Date.today,
+                                     comments: Faker::Lorem.words(8).join(' '))
+
+        5.times do
+          print '.'
+          change = Change.create(action: Faker::Lorem.characters(1),
+                                 path: Faker::Internet.url)
+
+          changeset.changes << change
+        end
+
+        repository.changesets << changeset
 
-        changeset.changes << change
+        changeset.save!
-      end
 
-      repository.changesets << changeset
+        rand(5).times do
+          print '.'
+          changeset.reload
 
-      changeset.save!
+          changeset.committer = Faker::Name.name if rand(99).even?
+          changeset.committed_on = Date.today + rand(999) if rand(99).even?
+          changeset.comments = Faker::Lorem.words(8).join(' ') if rand(99).even?
 
-      rand(5).times do
+          changeset.save!
-        print '.'
+        end
-        changeset.reload
-
-        changeset.committer = Faker::Name.name if rand(99).even?
-        changeset.committed_on = Date.today + rand(999) if rand(99).even?
-        changeset.comments = Faker::Lorem.words(8).join(' ') if rand(99).even?
-
-        changeset.save!
       end
     end