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
..
auth	Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers	2017-03-06 15:45:43 +01:00
badge	Revert "Enable Style/DotPosition"	2017-02-23 09:33:19 -06:00
bitbucket_import	Labels support color names in backend	2017-03-29 11:45:15 +00:00
chat_commands	Chat slash commands show labels correctly	2017-02-21 14:20:08 +01:00
checks	Backport changes from gitlab-org/gitlab-ee!1406	2017-03-13 12:31:27 +01:00
ci	Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master'	2017-03-27 12:21:22 +00:00
conflict	Allow resolving conflicts with non-ASCII chars	2017-03-15 11:18:29 +00:00
cycle_analytics	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
data_builder	Reinstitute a core manual status for manual actions	2017-03-06 10:04:04 +01:00
database	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
diff	take nonewline context into account in diff parser	2017-03-13 22:09:43 +02:00
downtime_check	Enable Style/MutableConstant	2017-02-23 09:31:56 -06:00
email	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
etag_caching	Introduce "polling_interval_multiplier" as application setting	2017-04-03 15:17:04 +02:00
fogbugz_import
gfm
git	Merge branch '22303-symbolic-in-tree' into 'master'	2017-04-03 15:59:24 +00:00
gitaly_client	Make GitLab use Gitaly for commit_is_ancestor	2017-03-30 16:06:31 +02:00
github_import	Rename skip_metrics to imported on the importable concern	2017-04-03 15:50:22 -03:00
gitlab_import
google_code_import	Use Namespace#full_path instead of Namespace#path	2017-02-14 18:38:20 +02:00
graphs
import_export	All CI offline migrations	2017-03-17 23:06:11 +00:00
ldap	Enable Style/Proc cop for rubocop	2017-04-02 12:48:43 +03:00
markdown
metrics	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
middleware	Fix go-get support for projects in nested groups	2017-03-07 19:40:19 -06:00
o_auth	Implement new service for creating user	2017-03-27 09:37:24 +00:00
request_profiler	Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb	2017-02-02 17:22:10 +01:00
saml	Fix code for cops	2017-02-23 09:31:57 -06:00
sanitizers	Enable Style/MultilineArrayBraceLayout	2017-02-23 09:32:22 -06:00
serializer	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
sherlock	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
sidekiq_middleware
sidekiq_status	SidekiqStatus need to be qualified in some cases	2017-02-14 18:37:21 +01:00
slash_commands	Allow slashes in slash command arguments	2017-02-17 10:34:43 +01:00
sql
template	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
testing	Introduce a new middleware for the test environment that can block requests	2017-03-22 19:45:21 +01:00
view/presenter	Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already respond to method	2017-01-25 12:14:02 +01:00
access.rb	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
allowable.rb	use a magic default :global symbol instead of nil	2017-03-09 11:49:52 -08:00
app_logger.rb
asciidoc.rb	Merge branch 'asciidoctor-xss-patch' into 'security'	2017-02-15 10:41:40 -05:00
auth.rb	Merge branch 'siemens/gitlab-ce-feature/openid-connect'	2017-03-07 16:16:08 +00:00
blame.rb
changes_list.rb	Enable Style/ClassCheck	2017-02-23 09:32:22 -06:00
chat_name_token.rb
closing_issue_extractor.rb
color_schemes.rb
config_helper.rb
contributions_calendar.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
contributor.rb
current_settings.rb	Enable Rails/Delegate	2017-02-23 09:32:42 -06:00
database.rb	Added Gitlab::Database.config	2017-03-17 17:08:10 +01:00
devise_failure.rb
downtime_check.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
ee_compat_check.rb	Fix Gitlab::EeCompatCheck: use ee_branch_found instead of ee_branch	2017-03-28 09:26:47 +02:00
emoji.rb	This quick-fixes an issue with existing award emoji not being valid anymore	2017-03-16 14:36:04 +01:00
environment_logger.rb
exclusive_lease.rb	Enable Style/MutableConstant	2017-02-23 09:31:56 -06:00
file_detector.rb	Enable Style/MutableConstant	2017-02-23 09:31:56 -06:00
git.rb
git_access.rb	Backport changes from gitlab-org/gitlab-ee!1406	2017-03-13 12:31:27 +01:00
git_access_status.rb
git_access_wiki.rb
git_logger.rb
git_post_receive.rb	replace find_with_namespace with find_by_full_path	2017-02-03 07:14:04 +07:00
git_ref_validator.rb
gitaly_client.rb	Add support for Gitaly calls over TCP connection	2017-04-03 18:45:36 +02:00
gl_id.rb
gon_helper.rb	Update API on frontend to use v4	2017-03-14 06:58:20 -04:00
highlight.rb	Copy code as GFM from diffs, blobs and GFM code blocks	2017-03-14 15:29:00 -06:00
identifier.rb
import_export.rb	Use Namespace#full_path instead of #path where appropriate	2017-02-23 17:55:01 -06:00
import_formatter.rb
import_sources.rb	Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settings	2017-01-23 16:58:13 +01:00
incoming_email.rb	No strong reasons to freeze them	2017-02-07 01:28:58 +08:00
issues_labels.rb
job_waiter.rb	Fix race conditions for AuthorizedProjectsWorker	2017-01-25 13:22:15 +01:00
key_fingerprint.rb
kubernetes.rb	Introduce maximum session time for terminal websocket connection	2017-02-06 11:49:30 +01:00
lazy.rb
lfs_token.rb
logger.rb
mail_room.rb
markup_helper.rb
metrics.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
optimistic_locking.rb	Merge branch 'dm-meer-blauw-op-straat' into 'master'	2017-02-23 17:19:28 +00:00
other_markup.rb	Revert "Prefer leading style for Style/DotPosition"	2017-02-23 09:33:05 -06:00
pages_transfer.rb	Rename pages namespace or project path when changed	2017-01-31 22:53:56 +00:00
polling_interval.rb	Introduce "polling_interval_multiplier" as application setting	2017-04-03 15:17:04 +02:00
popen.rb
project_search_results.rb	Search feature: redirects to commit page if query is commit sha and only commit found	2017-01-24 14:58:00 +03:00
project_transfer.rb	Rename pages namespace or project path when changed	2017-01-31 22:53:56 +00:00
prometheus.rb	Added Prometheus Service and Prometheus graphs	2017-03-07 16:57:42 +00:00
protocol_access.rb
recaptcha.rb	Use reCaptcha when an issue identified as spam	2017-02-07 12:56:20 +01:00
redis.rb	Fix config/mail_room.yml to be interpretable Ruby	2017-03-15 16:21:55 -06:00
reference_extractor.rb	Enable Style/MutableConstant	2017-02-23 09:31:56 -06:00
regex.rb	Check registry repository name against regexp	2017-04-03 11:38:39 +02:00
repo_path.rb	Helper method for storage path stripping	2017-03-29 14:48:04 +02:00
repository_check_logger.rb
request_context.rb	Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers	2017-03-06 15:45:43 +01:00
request_profiler.rb	Enable Style/MutableConstant	2017-02-23 09:31:56 -06:00
route_map.rb	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
routing.rb
search_results.rb	Fix code for cops	2017-02-23 09:31:57 -06:00
seeder.rb	Fix the Gitlab::Seeder monkey patch to disable mail delivery	2017-03-02 20:29:30 -05:00
sentry.rb
shell.rb	Merge branch 'fix-github-importer-slowness' into 'master'	2017-04-03 21:26:41 +00:00
shell_adapter.rb	Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/	2017-01-27 16:16:55 +01:00
sherlock.rb
sidekiq_logger.rb
sidekiq_status.rb	Make SidekiqStatus able to count number of jobs completed/running	2017-03-03 15:35:58 -08:00
sidekiq_throttler.rb
snippet_search_results.rb	Reduce query count for snippet search	2017-02-16 08:47:48 +00:00
time_tracking_formatter.rb	Add some API endpoints for time tracking.	2017-01-18 10:48:16 -06:00
timeless.rb
update_path_error.rb	Enable and autocorrect the CustomErrorClass cop	2017-03-01 15:28:10 +00:00
upgrader.rb	Don’t exclude some file in lib from rubocop	2017-02-23 09:32:42 -06:00
uploads_transfer.rb	Merge branch '29843-project-subgroup-transfer' into 'security'	2017-03-29 19:16:50 -07:00
url_blocker.rb	Merge branch 'ssrf' into 'security'	2017-03-20 18:53:45 -07:00
url_builder.rb
url_sanitizer.rb	Fix ProjectWiki#http_url_to_repo signature	2017-03-20 16:24:01 +01:00
user_access.rb	reverse the logic and use a clearer name	2017-03-09 13:59:19 -08:00
utils.rb
version_info.rb
visibility_level.rb	Make level_value accept string integers	2017-03-20 22:53:29 +01:00
workhorse.rb	Add feature flags for enabling (Upload|Receive)Pack for Gitaly	2017-04-03 18:44:57 +02:00