delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removes EE differences12533-shared-runners-warning	Filipa Lacerda	2019-07-05	2	-1/+6
\|
*	Merge branch 'ce-12464-remove-gitpushservice' into 'master'	Lin Jen-Shin	2019-07-05	1	-5/+7
\|\ \| \| \| \| \| \| \| \|	Fix call to removed GitPushService See merge request gitlab-org/gitlab-ce!30222
\| *	Fix call to removed GitPushServicece-12464-remove-gitpushservice	Markus Koller	2019-07-04	1	-5/+7
\| \|
* \|	Merge branch '12553-preferences' into 'master'	Phil Hughes	2019-07-05	2	-6/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for app/views/profiles/preferences/show.html.haml Closes gitlab-ee#12553 See merge request gitlab-org/gitlab-ce!30397
\| * \|	Removes EE differences	Filipa Lacerda	2019-07-05	2	-6/+11
\| \| \|
* \| \|	Merge branch 'fix-divergence-graph-error' into 'master'	Filipa Lacerda	2019-07-05	2	-3/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix divergence graph loading error Closes #64143 See merge request gitlab-org/gitlab-ce!30393
\| * \| \|	Fix divergence graph loading error	Phil Hughes	2019-07-05	2	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64143
* \| \| \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Phil Hughes	2019-07-05	2	-5/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^5.3.2 See merge request gitlab-org/gitlab-ce!30259
\| * \| \| \|	Update dependency @gitlab/ui to ^5.3.2	Lukas Eipert	2019-07-05	2	-5/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '57793-fix-line-age' into 'master'	Douwe Maan	2019-07-05	14	-2053/+2527
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support note position tracing on an image See merge request gitlab-org/gitlab-ce!30158
\| * \| \| \| \|	Refactor PositionTracer to support different types	Patrick Bajao	2019-07-05	14	-2053/+2527
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to prepare for supporing image type position tracing
* \| \| \| \|	Merge branch 'remove_unused_k8s_service_methods' into 'master'	Lin Jen-Shin	2019-07-05	5	-372/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove now unused KubernetesService methods See merge request gitlab-org/gitlab-ce!29925
\| * \| \| \| \|	Remove now unused KubernetesService methodsremove_unused_k8s_service_methods	James Fargher	2019-07-05	5	-372/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that KubernetesService can no longer be a DeploymentPlatform we can remove all kubernetes client code and KubernetesService edge cases.
* \| \| \| \| \|	Merge branch 'patch-71' into 'master'	Sean McGivern	2019-07-05	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update SAST.gitlab-ci.yml w/ FAIL_NEVER ENV See merge request gitlab-org/gitlab-ce!30331
\| * \| \| \| \| \|	Update SAST.gitlab-ci.yml w/ FAIL_NEVER ENV	Lucas Charles	2019-07-05	1	-0/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/issues/10564
* \| \| \| \| \|	Merge branch 'fix-alerting-ui' into 'master'	Phil Hughes	2019-07-05	2	-3/+51
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alert creation dropdown menu Closes gitlab-ee#12572 See merge request gitlab-org/gitlab-ce!30332
\| * \| \| \| \|	Fix alert creation dropdown menu	Sarah Yasonik	2019-07-05	2	-3/+51
\|/ / / / /
* \| \| \| \|	Merge branch 'docs-workflow-images' into 'master'	Marcia Ramos	2019-07-05	18	-17/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Move gitlab_flow doc images to /img dir See merge request gitlab-org/gitlab-ce!30389
\| * \| \| \| \|	Move workflow images to img dir	Marcel Amirault	2019-07-05	18	-17/+18
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean out workflow directory by moving images from gitlab_flow doc to /img
* \| \| \| \|	Merge branch 'if-6990-enforce_smartcard_session_for_git_and_api' into 'master'12-1-stable-prepare-rc1	Bob Van Landuyt	2019-07-05	2	-13/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of "Require session with smartcard login for Git access" See merge request gitlab-org/gitlab-ce!30384
\| * \| \| \| \|	CE port of "Require session with smartcard login for Git access"	Imre Farkas	2019-07-05	2	-13/+32
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch ↵	Bob Van Landuyt	2019-07-05	16	-16/+207
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'58409-increase-graphql-complexity-for-fields-that-make-gitaly-calls' into 'master' Increase GraphQL complexity for fields that make Gitaly Calls Closes #58409 See merge request gitlab-org/gitlab-ce!28814
\| * \| \| \|	Address reviewer comments58409-increase-graphql-complexity-for-fields-that-make-gitaly-calls	charlieablett	2019-07-05	6	-25/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove Gitaly call check for fields that have a constant complexity declared - Add associated test
\| * \| \| \|	Address reviewer comments	charlieablett	2019-07-03	5	-40/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add 1 for all fields that call Gitaly (with resolvers or without) - Clarify comment regarding Gitaly call alert - Expose predicate `calls_gitaly?` instead of ivar
\| * \| \| \|	Wrap proc properly in gitaly call counts	charlieablett	2019-07-03	8	-21/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add `calls_gitaly: true` to some fields missing (hey, it works!) - Clarify proc wrapping - Add kwargs argument to `mount_mutation`
\| * \| \| \|	Alert if `calls_gitaly` declaration missing	charlieablett	2019-07-03	8	-24/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move `calls_gitaly_check` to public - Add instrumentation for flagging missing CallsGitaly declarations - Wrap resolver proc in before-and-after Gitaly counts to get the net Gitaly call count for the resolver.
\| * \| \| \|	Remove potentially noisy warning	charlieablett	2019-07-03	2	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- If Gitaly calls are missing, it could be due to a conditional and may just become noise
\| * \| \| \|	Enumerate fields with Gitaly calls	charlieablett	2019-07-03	4	-4/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add a complexity of 1 if Gitaly is called at least once - Add an error notification if `calls_gitaly` isn't right for a particular field
* \| \| \| \|	Merge branch 'revert-68b1ed92' into 'master'	Lin Jen-Shin	2019-07-05	1	-2/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb from quarantine Closes gitlab-org/quality/staging#40 See merge request gitlab-org/gitlab-ce!30378
\| * \| \| \| \|	Revert "Merge branch 'qa-quarantine-failing-push-mirror-repo-spec' into ↵	Mark Lapierre	2019-07-05	1	-2/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !25590
* \| \| \| \|	Merge branch 'add-pgformatter-into-database-tooling-docs' into 'master'	Evan Read	2019-07-05	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pgFormatter as a database tooling See merge request gitlab-org/gitlab-ce!30374
\| * \| \| \| \|	Add pgFormatter as a database tooling	Mayra Cabrera	2019-07-05	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes a PostgreSQL syntax beautifier as a database tooling.
* \| \| \| \|	Merge branch 'patch-71' into 'master'NicoleSchwartz-Python-Blog	Evan Read	2019-07-05	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor spelling errors fixed See merge request gitlab-org/gitlab-ce!30303
\| * \| \| \| \|	Minor spelling errors fixed	Aurelien	2019-07-03	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-kramdown-warnings-2' into 'master'	Evan Read	2019-07-04	21	-126/+123
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix markdown to reduce number of kramdown warnings (part 2) See merge request gitlab-org/gitlab-ce!30150
\| * \| \| \| \| \|	Small markdown tweaks to clear kramdown warnings	Marcel Amirault	2019-07-04	21	-126/+123
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing square brackets, links, etc in: merge_requests.md vulnerabilities.md issues.md issues_statistics.md pipelines.md services.md group_milestones.md milestones.md runners.md changelog.md issue_workflow.md elasticsearch.md api_graphql_styleguide.md automatic_ce_ee_merge.md file_storage.md architecture.md database_debugging.md index.md index.md frontend_testing.md pry_debugging.md vue.md development_process.md
* \| \| \| \| \|	Merge branch 'tc-fix-db-roulette' into 'master'	Mayra Cabrera	2019-07-04	3	-36/+23
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reviewer roulette for DB reviews See merge request gitlab-org/gitlab-ce!30300
\| * \| \| \| \|	DRY up conditions for files require DB review	Toon Claes	2019-07-04	3	-36/+23
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop using two separate lists for the conditions which files require a database review. Related discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30156#note_187732053
* \| \| \| \|	Merge branch 'qa-increase-review-deploy-timeout' into 'master'	Lin Jen-Shin	2019-07-04	2	-24/+106
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Review Apps] Add resource requests and limits to most of the chart resources See merge request gitlab-org/gitlab-ce!30155
\| * \| \| \| \|	Add resources requests and limits for all Review Apps resources	Rémy Coutable	2019-07-04	1	-23/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Retry review-deploy only once	Rémy Coutable	2019-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'docs-ee-12592-ce-59847' into 'master'	Marcia Ramos	2019-07-04	3	-10/+9
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Clarify project and repo size Closes gitlab-ee#12592 See merge request gitlab-org/gitlab-ce!30322
\| * \| \| \| \|	Docs: Clarify project and repo size	Cynthia Ng	2019-07-04	3	-10/+9
\|/ / / / /
* \| \| \| \|	Merge branch 'doc-mj/definition-of-done' into 'master'	Marcia Ramos	2019-07-04	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Definition of done includes deployed change See merge request gitlab-org/gitlab-ce!30362
\| * \| \| \| \|	Definition of done includes deployed change	Marin Jankovski	2019-07-04	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-user-info-to-auth-logs-docs' into 'master'	Marcia Ramos	2019-07-04	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for new info on `auth.log` See merge request gitlab-org/gitlab-ce!30315
\| * \| \| \| \| \|	Add new info for auth.log	Mayra Cabrera	2019-07-04	1	-0/+3
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From 12.1, user information (id and username) are also included on auth.log. Documentation was updated to reflect this. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
* \| \| \| \| \|	Merge branch 'fix-sidekiq-transaction-check-race' into 'master'	Nick Thomas	2019-07-04	2	-6/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race in forbid_sidekiq_in_transactions.rb Closes #64088 See merge request gitlab-org/gitlab-ce!30359
\| * \| \| \| \| \|	Fix race in forbid_sidekiq_in_transactions.rbfix-sidekiq-transaction-check-race	Kamil Trzciński	2019-07-04	2	-6/+12
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current code uses module attribute which stores value global instead of locally (thread locally). This results in concurrent accesses to overwrite the each other values
* \| \| \| \| \|	Merge branch 'mj/config-readme-diff' into 'master'	Achilleas Pipinellis	2019-07-04	1	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty lines in config/README.md See merge request gitlab-org/gitlab-ce!30346