gitlab-org--gitlab-foss/db
Grzegorz Bizon 44321b1a3d Merge branch 'master' into feature/multi-level-container-registry-images
* master: (57 commits)
  Ensure we generate unique usernames otherwise validations fail
  Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
  Ensure users have a short username otherwise a click event is triggered ...
  Enable the `bullet_logger` setting; enable `raise` in test environment
  Fix Rubocop offenses
  Set the right timeout for Gitlab::Shell#fetch_remote
  Refactoring Projects::ImportService
  Move methods that are not related to mirroring to the repository model
  Fix GitHub pull request formatter spec
  Rename skip_metrics to imported on the importable concern
  Add CHANGELOG
  Remove unused include from RepositoryImportWorker
  Skip MR metrics when importing projects from GitHub
  Fetch GitHub project as a mirror to get all refs at once
  Make file templates easy to use and discover
  Ensure user has a unique username otherwise `user10` would match `user1`
  Ensure the AbuseReport fixtures create unique reported users
  Don't use FFaker in factories, use sequences instead
  Fix brittle specs
  Fix the AbuseReport seeder
  ...

Conflicts:
	db/schema.rb
2017-04-04 13:36:36 +02:00
..
fixtures Ensure we generate unique usernames otherwise validations fail 2017-04-04 08:48:49 +02:00
migrate Merge branch 'master' into feature/multi-level-container-registry-images 2017-04-04 13:36:36 +02:00
post_migrate Use default_value_for to set notified_of_own_activity instead of using a DB migration 2017-03-24 15:06:36 -07:00
schema.rb Merge branch 'master' into feature/multi-level-container-registry-images 2017-04-04 13:36:36 +02:00
seeds.rb