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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix syntax error in scriptfix-metadata-script-broken-master	Heinrich Lee Yu	2019-07-22	1	-1/+1
\|
*	Merge branch '64428-tests-are-not-split-optimally-by-knapsack' into 'master'	Rémy Coutable	2019-07-22	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Upload new Knapsack report instead of merging Closes #64428 See merge request gitlab-org/gitlab-ce!30612
\| *	Upload new knapsack report instead of merging64428-tests-are-not-split-optimally-by-knapsack	Heinrich Lee Yu	2019-07-18	1	-0/+1
\| \|
* \|	Merge branch '63833-fix-jira-issues-url' into 'master'	Ash McKenzie	2019-07-22	3	-2/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Handle trailing slashes when generating issue URLs See merge request gitlab-org/gitlab-ce!30911
\| * \|	Handle trailing slashes when generating Jira URLs63833-fix-jira-issues-url	Heinrich Lee Yu	2019-07-22	3	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Applies to issues_url and new_issue_url
* \| \|	Merge branch 'fix-search-project-in-boards-new-issue' into 'master'	Kushal Pandya	2019-07-22	1	-3/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use the property of name_with_namespace instead of name for the new issue form in group boards See merge request gitlab-org/gitlab-ce!30021
\| * \| \|	use the property of name_with_namespace instead of name for the new issue ↵	Emeryao	2019-07-22	1	-3/+5
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	form in boards add a new attribute for name_with_namespace prettier the changed code
* \| \|	Merge branch 'docs-mdl-info' into 'master'	Evan Read	2019-07-22	2	-18/+41
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info about mdl to documentation See merge request gitlab-org/gitlab-ce!30792
\| * \| \|	Add info about mdl to documentation	Marcel Amirault	2019-07-22	2	-18/+41
\|/ / /
* \| \|	Merge branch 'sl-qa-staging-65-fix-check-mentions-for-xss-spec' into 'master'	Ramya Authappan	2019-07-22	1	-2/+12
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates check_mentions_for_xss_spec to use admin token for creating the user Closes gitlab-org/quality/staging#65 See merge request gitlab-org/gitlab-ce!30943
\| * \|	Create user as adminsl-qa-staging-65-fix-check-mentions-for-xss-spec	Sanad Liaquat	2019-07-19	1	-2/+12
\| \| \|
* \| \|	Merge branch 'MattPennaThe3rd-EmailConf' into 'master'	Evan Read	2019-07-22	2	-7/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for email confirmation signup restriction Closes #63060 See merge request gitlab-org/gitlab-ce!30968
\| * \| \|	Documentation for email confirmation signup restriction	Matt Penna	2019-07-22	2	-7/+16
\|/ / /
* \| \|	Merge branch 'docs/sast-analyzers' into 'master'	Evan Read	2019-07-22	2	-0/+195
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document all the available options for SAST Closes gitlab-ee#10120 See merge request gitlab-org/gitlab-ce!30747
\| * \| \|	Document all the available options for SAST	Achilleas Pipinellis	2019-07-22	2	-0/+195
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port all info from: - security-products/sast/blob/master/docs/README.md - security-products/sast/blob/master/docs/analyzers.md
* \| \|	Merge branch ↵	Evan Read	2019-07-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'64768-update-email-address-on-how-to-reset-your-root-password-docs' into 'master' Resolve "Update email address on How to reset your root password docs" Closes #64768 See merge request gitlab-org/gitlab-ce!30926
\| * \| \|	Update root default email address to current value64768-update-email-address-on-how-to-reset-your-root-password-docs	astrachan	2019-07-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs-lists-cleanup-2' into 'master'	Evan Read	2019-07-22	16	-134/+128
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unordered list spacing (part 2) See merge request gitlab-org/gitlab-ce!30796
\| * \| \| \|	Fix unordered list spacing	Marcel Amirault	2019-07-22	16	-134/+128
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct the spacing of unordered markdown lists in docs, to maintain standards of documentation, in /user and others.
* \| \| \|	Merge branch 'qa/standardize-page-objects-use-on-ce-plan-tests' into 'master'	Mark Lapierre	2019-07-21	5	-37/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize page objects use on CE Plan tests See merge request gitlab-org/gitlab-ce!30962
\| * \| \| \|	Standardize Page Objects use on CE Plan Testsqa/standardize-page-objects-use-on-ce-plan-tests	Walmyr Lima	2019-07-20	5	-37/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a first iteration to address the following issue: https://gitlab.com/gitlab-org/quality/team-tasks/issues/168 Note: depends on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30945
* \| \| \| \|	Merge branch 'wiki-usage-pings' into 'master'	Douwe Maan	2019-07-21	12	-16/+270
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wiki Usage Ping for Create SMAU See merge request gitlab-org/gitlab-ce!30864
\| * \| \| \|	Count wiki page creation	Alex Kalderimis	2019-07-21	12	-16/+270
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a counter to count page creation, which is reflected in the usage-data we collect. The number created is stored in Redis, avoiding DB access.
* \| \| \|	Merge branch 'qa/refactor-e2e-test' into 'master'64403-remove-node-polyfills-in-webpack	Dan Davison	2019-07-19	1	-11/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor collapse issue comments end-to-end test See merge request gitlab-org/gitlab-ce!30902
\| * \| \| \|	Refactor collapse comments end-to-end testqa/refactor-e2e-test	Walmyr Lima	2019-07-19	1	-11/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To: - Better separate scopes (pre-conditions on before, tests on it) - Remove unnecessary expectation - Replace other unnecessary expectations by page.assert_text - Move variables closer to where they're used
* \| \| \| \|	Merge branch 'qa/refactor-create-issue-e2e-test' into 'master'	Dan Davison	2019-07-19	1	-12/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor create issue end-to-end test See merge request gitlab-org/gitlab-ce!30945
\| * \| \| \| \|	Refactor create issue end-to-end testqa/refactor-create-issue-e2e-test	Walmyr Lima	2019-07-19	1	-12/+16
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This refactor: - Moves the tests pre-conditions to a before blocks - Creates an issue via the api for the second test to improve the test suite performance
* \| \| \| \|	Merge branch 'patch-72' into 'master'	Stan Hu	2019-07-19	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes typo in developer documentation See merge request gitlab-org/gitlab-ce!30964
\| * \| \| \| \|	Fixes typo in developer gotcha documentation	Jeremy Jackson	2019-07-19	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '64731-fix-project-auto-devops-api' into 'master'	Mayra Cabrera	2019-07-19	5	-21/+45
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the project auto devops API See merge request gitlab-org/gitlab-ce!30946
\| * \| \| \| \|	Fix the project auto devops API	Nick Thomas	2019-07-19	5	-21/+45
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If `project_auto_devops.enabled` is nil for a project, when setting any auto devops values via the API, we try to create a new row in the DB, instead of re-using the existing one. This leads to the project_id being set to nil, and the database `NOT NULL` constraint leading to a 500 response. This commit resolves the issue by correctly detecting the presence of a ProjectAutoDevops row and re-using it. Persistence is also moved away from explicit `update!` calls and into relying on `autosave: true` on the model.
* \| \| \| \|	Merge branch 'sh-fix-gitaly-server-info-cache' into 'master'	Mayra Cabrera	2019-07-19	3	-1/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Gitaly auto-detection caching Closes #64802 See merge request gitlab-org/gitlab-ce!30954
\| * \| \| \| \|	Fix Gitaly auto-detection caching	Stan Hu	2019-07-19	3	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If `GitalyClient#can_use_disk?` returned `false`, it was never cached properly and led to excessive number of Gitaly calls. Instead of using `cached_value.present?`, we need to check `cached_value.nil?`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64802
* \| \| \| \| \|	Merge branch '64160-fix-duplicate-buttons' into 'master'	Fatih Acet	2019-07-19	3	-17/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate buttons Closes #64160 See merge request gitlab-org/gitlab-ce!30757
\| * \| \| \| \| \|	Remove duplicate buttons64160-fix-duplicate-buttons	Samantha Ming	2019-07-17	3	-17/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'tc-database-review-process' into 'master'	Nick Thomas	2019-07-19	10	-42/+196
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document database review process See merge request gitlab-org/gitlab-ce!30405
\| * \| \| \| \| \| \|	Document database review process	Toon Claes	2019-07-19	10	-42/+196
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6069
* \| \| \| \| \| \|	Merge branch '30939-remove-worker-label-from-ruby-sampler-metrics' into 'master'	Kamil Trzciński	2019-07-19	1	-19/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get rid of `worker_label` in RubySampler See merge request gitlab-org/gitlab-ce!30942
\| * \| \| \| \| \| \|	Get rid of `worker_label` in RubySampler30939-remove-worker-label-from-ruby-sampler-metrics	Aleksei Lipniagov	2019-07-19	1	-19/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have Prometheus::PidProvider which sets correct worker id for a process, so such implementation of `worker_label` in the sampler is obsolete.
* \| \| \| \| \| \| \|	Merge branch 'fj-avoid-incresaing-usage-ping-when-not-enabled' into 'master'	Nick Thomas	2019-07-19	3	-0/+40
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid increasing redis counters when usage_ping is disabled See merge request gitlab-org/gitlab-ce!30949
\| * \| \| \| \| \| \| \|	Avoid increasing redis counters when usage_ping is disabled	Francisco Javier López	2019-07-19	3	-0/+40
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-alignment-on-security-reports' into 'master'	Phil Hughes	2019-07-19	3	-4/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the alignment on reports See merge request gitlab-org/gitlab-ce!30839
\| * \| \| \| \| \| \|	Fixes the alignment on reports	Sam Beckham	2019-07-19	3	-4/+7
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Removes a justify-center class that causes reports to centrally align
* \| \| \| \| \| \|	Merge branch '64265-center-loading-icon' into 'master'	Phil Hughes	2019-07-19	2	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centers loading icon in CI action Closes #64265 See merge request gitlab-org/gitlab-ce!30947
\| * \| \| \| \| \| \|	Centers loading icon in CI action	Filipa Lacerda	2019-07-19	2	-0/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'	Sean McGivern	2019-07-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `issuable_path` helper See merge request gitlab-org/gitlab-ce!30913
\| * \| \| \| \| \| \| \|	Use issuable_path to allow support of epics	Brett Walker	2019-07-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '64722-mg-export-frontend-fixtures' into 'master'	Phil Hughes	2019-07-19	68	-81/+137
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Export frontend fixtures as pipeline artifact" Closes #64722 and #59166 See merge request gitlab-org/gitlab-ce!30917
\| * \| \| \| \| \| \| \|	Add missing static fixture64722-mg-export-frontend-fixtures	Mike Greiling	2019-07-19	1	-0/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move frontend fixtures into spec/frontend	Mike Greiling	2019-07-19	61	-20/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves every fixture source file from spec/javascripts to spec/frontend