gitlab-org--gitlab-foss/lib
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
..
api Merge branch 'backport-sticking-api-helper-changes' into 'master' 2017-04-04 11:31:21 +00:00
assets
backup Fix custom hooks restore 2017-03-29 14:48:06 +02:00
banzai Merge branch 'make_user_mentions_case_insensitive' into 'master' 2017-03-29 09:37:16 +00:00
bitbucket Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
ci Backport API changes needed to fix sticking in EE 2017-03-31 13:56:53 +02:00
constraints
container_registry Remove unneeded char in registry repository path 2017-04-04 11:58:15 +02:00
generators/rails/post_deployment_migration
gitlab Merge branch 'master' into feature/multi-level-container-registry-images 2017-04-04 13:36:36 +02:00
json_web_token
mattermost Merge branch 'master' into 'zj-create-mattermost-team' 2017-03-06 14:04:14 +00:00
omni_auth Remove explicit `require` calls, and use `require_dependency` when needed 2017-03-13 14:29:55 +01:00
rouge Document tag option and clarify spec 2017-03-14 15:29:00 -06:00
support Add gitaly source installation instructions 2017-03-21 14:55:41 +01:00
tasks Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into 'master' 2017-03-29 23:29:38 +00:00
additional_email_headers_interceptor.rb
banzai.rb
disable_email_interceptor.rb
email_template_interceptor.rb
event_filter.rb
expand_variables.rb
extracts_path.rb Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
file_size_validator.rb
file_streamer.rb
gitlab.rb
gt_one_coercion.rb
repository_cache.rb
static_model.rb
unfold_form.rb
uploaded_file.rb
version_check.rb