Dmitriy Zaporozhets 6024697c10 Merge branch 'master' into 'dz-rename-reserved-project-names' ... # Conflicts: # db/schema.rb		2016-12-27 16:34:20 +00:00
..
migrate_process_commit_worker_jobs_spec.rb
remove_dot_git_from_usernames.rb
rename_reserved_project_names_spec.rb	Fix rename projects spec so it doesn't hang	2016-12-27 13:45:44 +01:00