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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	License Compliance defaults to Python 3	Fabien Catteau	2019-08-26	1	-4/+4
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License Compliance now uses Python 3 by default. See https://gitlab.com/gitlab-org/gitlab-ee/issues/12032
* \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2019-08-26	1	-0/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs for forgotten secrets file See merge request gitlab-org/gitlab-ce!31393
\| * \| \| \| \|	ci_builds also has encrypted tokens	Bill Bagdon	2019-08-26	1	-0/+23
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These need to be reset
* \| \| \| \|	Merge branch 'doc-sethgitlab-csupdate' into 'master'	Achilleas Pipinellis	2019-08-26	1	-1/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added sample to container scanning See merge request gitlab-org/gitlab-ce!32166
\| * \| \| \| \|	Updated container scanning	Seth Berger	2019-08-26	1	-1/+31
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated container scanning docs with a sample config
* \| \| \| \|	Merge branch 'docs-password-storage' into 'master'	Achilleas Pipinellis	2019-08-26	2	-0/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how GitLab stores passwords See merge request gitlab-org/gitlab-ce!32077
\| * \| \| \| \|	Improve readability of salting descriptiondocs-password-storage	Christiaan Conover	2019-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a comma in the final sentence of the description of salting, to improve the readability of what's being said.
\| * \| \| \| \|	Fix a typo in the section on stretching	Christiaan Conover	2019-08-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct a typo in the description of how passwords are stretched.
\| * \| \| \| \|	Fix link syntax typo	Christiaan Conover	2019-08-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a missing parentheses in the markdown for a link caused by the URL containing parentheses.
\| * \| \| \| \|	Document how GitLab stores passwords	Christiaan Conover	2019-08-21	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide details on how GitLab stores passwords, including hashing, stretching, and salting. This was driven by a customer asking for this information for a security compliance audit report.
* \| \| \| \| \|	Merge branch 'docs-gitaly-path-fixes' into 'master'	Achilleas Pipinellis	2019-08-26	1	-9/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Gitaly path details See merge request gitlab-org/gitlab-ce!31931
\| * \| \| \| \| \|	Improve Gitaly path details	Ben Bodenmiller	2019-08-26	1	-9/+13
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	related to https://gitlab.com/gitlab-org/gitlab-ce/issues/65422
* \| \| \| \| \|	Merge branch '66132-document-new-line-chart-in-panel-metric-type' into 'master'	Achilleas Pipinellis	2019-08-26	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Documentation for `line-chart` See merge request gitlab-org/gitlab-ce!32075
\| * \| \| \| \| \|	Add Documentation for `line-chart`	Miguel Rincon	2019-08-26	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'user_name_migration' into 'master'	Lin Jen-Shin	2019-08-26	5	-2/+53
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add first and last name to User model See merge request gitlab-org/gitlab-ce!31985
\| * \| \| \| \| \|	Using before_save method instead of setter	Aishwarya Subramanian	2019-08-26	5	-2/+53
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unused method for name setter method
* \| \| \| \| \|	Merge branch 'user-tracking-settings' into 'master'	Jan Provaznik	2019-08-26	8	-105/+204
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjusts snowplow to use cookies for sessions Closes telemetry#77 See merge request gitlab-org/gitlab-ce!31826
\| * \| \| \| \| \|	Changes snowplow to use cookies for sessions	Jeremy Jackson	2019-08-26	8	-105/+204
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also restructures how and where the configuration for Snowplow lives.
* \| \| \| \| \|	Merge branch 'sh-fix-nplusone-issues' into 'master'	Mayra Cabrera	2019-08-26	4	-2/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 Gitaly calls in /api/v4/projects/:id/issues See merge request gitlab-org/gitlab-ce!32171
\| * \| \| \| \| \|	Fix N+1 Gitaly calls in /api/v4/projects/:id/issuessh-fix-nplusone-issues	Stan Hu	2019-08-23	4	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31938. In GitLab 9.0, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9661 removed the `subscribed` flag from the API when the user requested a list of issues or merge requests since calculating this value triggers extensive Markdown processing. In GitLab 12.0 via a4fbf39e, we accidentally reintroduced this performance regression by changing `IssueBasic` to `Issue` in `entities.rb`. This showed up as a Gitaly N+1 issue since the Markdown processing would attempt to extract a commit if it detected a regex that matched a commit. We restore the prior behavior by once again removing the `subscribed` flag for the bulk list of issues and merge requests and add a test to ensure they aren't reintroduced. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/66202
* \| \| \| \| \| \|	Merge branch 'bw-move-funtion-to-resolver' into 'master'	Mayra Cabrera	2019-08-26	11	-33/+58
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade GraphQL gem to 1.8.4 and replace echo function with a resolver See merge request gitlab-org/gitlab-ce!32016
\| * \| \| \| \| \| \|	Replace echo function with a resolver	Brett Walker	2019-08-26	11	-33/+58
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `GraphQL::Function` has been deprecated in favor of resolvers.
* \| \| \| \| \| \|	Merge branch 'pl-qa-k8s' into 'master'	Dan Davison	2019-08-26	6	-88/+338
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor kubernetes setup in QA See merge request gitlab-org/gitlab-ce!29799
\| * \| \| \| \| \| \|	Extract gcloud and minikube cluster provider	Peter Leitzen	2019-08-26	6	-88/+338
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cluster provider k3d
* \| \| \| \| \| \|	Merge branch 'georgekoltsov/54023-fogbugz-visibility-level' into 'master'	Rémy Coutable	2019-08-26	3	-1/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change default visibility level for FogBugz imported projects to Private See merge request gitlab-org/gitlab-ce!32142
\| * \| \| \| \| \| \|	Change default visibility level for FogBugz imported projects to Private	George Koltsov	2019-08-26	3	-1/+35
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'qa-use-dag-for-package-and-qa-always-job' into 'master'	Lin Jen-Shin	2019-08-26	1	-4/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the 'needs' keyword for 'package-and-qa' job See merge request gitlab-org/gitlab-ce!32085
\| * \| \| \| \| \| \|	Use the 'needs' keyword for 'package-and-qa-always' job	Rémy Coutable	2019-08-26	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'id-code-review-smau' into 'master'	Lin Jen-Shin	2019-08-26	7	-2/+35
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add usage pings for merge request creating See merge request gitlab-org/gitlab-ce!32059
\| * \| \| \| \| \| \| \|	Add usage pings for merge request creating	Igor	2019-08-26	7	-2/+35
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code Review Usage Ping for Create SMAU
* \| \| \| \| \| \| \|	Merge branch 'zj-remove-object-pools-feature-flag' into 'master'	Nick Thomas	2019-08-26	4	-55/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the object pools feature flag See merge request gitlab-org/gitlab-ce!32204
\| * \| \| \| \| \| \| \|	Remove the object pools feature flag	Zeger-Jan van de Weg	2019-08-26	4	-55/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The flag defaulted to true, so there's no change unless users turned it off. Given there's a lack of issues regarding object pools, this should be OK.
* \| \| \| \| \| \| \| \|	Merge branch 'qa-copy-license-file-in-qa-image' into 'master'	Lin Jen-Shin	2019-08-26	2	-1/+11
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy `ee/app/models/license.rb` in the QA image if present See merge request gitlab-org/gitlab-ce!32111
\| * \| \| \| \| \| \| \|	Copy ee/app/models/license.rb in the QA image if presentqa-copy-license-file-in-qa-image	Rémy Coutable	2019-08-26	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'pl-rubocop-include-exclude' into 'master'	Sean McGivern	2019-08-26	13	-112/+67
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Utilize RuboCop's Include/Exclude config See merge request gitlab-org/gitlab-ce!32098
\| * \| \| \| \| \| \| \| \|	Utilize RuboCop's Include/Exclude config	Peter Leitzen	2019-08-26	13	-112/+67
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop checking the file location programmatically.
* \| \| \| \| \| \| \| \|	Merge branch 'renovate/gitlab-packages' into 'master'	Filipa Lacerda	2019-08-26	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to v5.19.0 See merge request gitlab-org/gitlab-ce!32202
\| * \| \| \| \| \| \| \|	Update dependency @gitlab/ui to v5.19.0	Lukas Eipert	2019-08-26	2	-5/+5
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'pl-danger-map-rubocop' into 'master'	Ash McKenzie	2019-08-26	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Danger: Map .rubocop{,_todo}.yml to ~backend See merge request gitlab-org/gitlab-ce!32156
\| * \| \| \| \| \| \| \|	Danger: Map .rubocop{,_todo}.yml to ~backend	Peter Leitzen	2019-08-26	1	-0/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Nick Thomas	2019-08-26	3	-1/+28
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'66443-unrecoverable-configuration-loop-in-external-auth-control' into 'master' Resolve "Unrecoverable configuration loop in external auth control" Closes #66443 See merge request gitlab-org/gitlab-ce!32102
\| * \| \| \| \| \| \|	Add more tests to cover all cases66443-unrecoverable-configuration-loop-in-external-auth-control	Robert Schilling	2019-08-22	1	-0/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add test, reduce complexity	Robert Schilling	2019-08-22	2	-2/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't check external authorization when disabling the service	Robert Schilling	2019-08-22	2	-1/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '21505-quickactions-update-pd' into 'master'	Kamil Trzciński	2019-08-26	10	-32/+197
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply quickactions when modifying comments See merge request gitlab-org/gitlab-ce!31136
\| * \| \| \| \| \| \| \|	Add edit_note and spec for editing quick actions	Patrick Derichs	2019-08-26	10	-32/+197
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call QuickActionsService on Note update Add support for notes which just contain commands after editing Return http status gone (410) if note was deleted Temporary frontend addition so it is not failing when a note is deleted Move specs to shared examples Fix rubocop style issue Deleting note on frontend when status is 410 Use guard clause for note which got deleted Simplified condition for nil note This method should no longer be called with nil note Refactoring of execute method to reduce complexity Move errors update to delete_note method Note is now deleted visually when it only contains commands after update Add expectation Fix style issues Changing action to fix tests Add tests for removeNote and update deleteNote expectations
* \| \| \| \| \| \| \|	Merge branch 'da/ignore-tests-in-security-reports' into 'master'	Rémy Coutable	2019-08-26	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dont run SAST on tests See merge request gitlab-org/gitlab-ce!32011
\| * \| \| \| \| \| \| \|	Dont run SAST on tests	Dennis Appelt	2019-08-26	1	-0/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'patch-73' into 'master'	Sean McGivern	2019-08-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab_schema.rb to fix typo See merge request gitlab-org/gitlab-ce!32200
\| * \| \| \| \| \| \| \|	Update gitlab_schema.rb to fix typo	Lucy Fox	2019-08-26	1	-1/+1
\|/ / / / / / / /