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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rename clearDetailIssue() to clearIssueDetail()winh-issue-boards-clearIssueDetail	Winnie Hellmann	2019-06-03	6	-10/+10
\|
*	Merge branch 'issafeurl-utility' into 'master'	Kushal Pandya	2019-06-03	2	-0/+120
\|\ \| \| \| \| \| \| \| \|	Add global isSafeURL utility See merge request gitlab-org/gitlab-ce!28943
\| *	Add global isSafeURL utilityissafeurl-utility	Paul Gascou-Vaillancourt	2019-06-03	2	-0/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added isSafeURL utility based on prior work in gitlab-ee - Also added isAbsoluteOrRootRelative() and getBaseURL() utils, needed by isSafeURL - Removed URL() fallback because URL() is now polyfilled - Updated specs
* \|	Merge branch 'winh-notes-app-jest' into 'master'	Clement Ho	2019-06-03	5	-109/+114
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move NoteApp tests to Jest Closes #62399 See merge request gitlab-org/gitlab-ce!28903
\| * \|	Move NoteApp tests to Jest	Winnie Hellmann	2019-06-03	5	-109/+114
\|/ /
* \|	Merge branch ↵	Clement Ho	2019-06-03	2	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62092-missing-padding-next-to-time-windows-dropdown-on-metrics-dashboard' into 'master' Added padding to time window dropdown in monitor dashboard Closes #62092 See merge request gitlab-org/gitlab-ce!28897
\| * \|	Added padding to time window dropdown in monitor dashboard	Dhiraj Bodicherla	2019-06-03	2	-1/+6
\|/ /
* \|	Merge dev.gitlab.org master into GitLab.com master	Yorick Peterse	2019-06-03	77	-171/+1275
\|\ \
\| * \	Merge branch 'security-jej/prevent-web-sign-in-bypass' into 'master'	GitLab Release Tools Bot	2019-06-03	3	-1/+47
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent password sign in restriction bypass See merge request gitlab/gitlabhq!2702
\| \| * \|	Prevent password sign in restriction bypass	James Edwards-Jones	2019-05-21	3	-1/+47
\| \| \| \|
\| * \| \|	Merge branch 'security-fix_milestones_search_api_leak' into 'master'	GitLab Release Tools Bot	2019-06-03	7	-7/+131
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve: Milestones leaked via search API Closes #2822 See merge request gitlab/gitlabhq!2997
\| \| * \| \|	Resolve: Milestones leaked via search API	Felipe Artur	2019-05-20	7	-7/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone titles being leaked using search API when users cannot read milestones
\| * \| \| \|	Merge branch 'security-60039' into 'master'	GitLab Release Tools Bot	2019-06-03	8	-33/+144
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow invalid MR branch name See merge request gitlab/gitlabhq!3052
\| \| * \| \| \|	Refactor spec to not use truthy or falsey	Mark Chao	2019-05-03	1	-58/+58
\| \| \| \| \| \|
\| \| * \| \| \|	Use full ref when creating MR pipeline in specs	Mark Chao	2019-05-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Continuation of 426488b7218e85ce69868ae4628801af2322b74a
\| \| * \| \| \|	Validate MR branch names	Mark Chao	2019-05-03	7	-30/+141
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents refspec as branch name, which would bypass branch protection when used in conjunction with rebase. HEAD seems to be a special case with lots of occurrence, so it is considered valid for now. Another special case is `refs/head/*`, which can be imported.
\| * \| \| \| \|	Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'	GitLab Release Tools Bot	2019-06-03	11	-11/+166
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handling password on import by url page See merge request gitlab/gitlabhq!3061
\| \| * \| \| \| \|	Handling password on import by url page	Sam Bigelow	2019-05-29	4	-23/+24
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Hide password on import by url form	Igor Drozdov	2019-05-29	11	-7/+161
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dm-http-hostname-override' into 'master'	GitLab Release Tools Bot	2019-06-03	38	-92/+587
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protect Gitlab::HTTP against DNS rebinding attack See merge request gitlab/gitlabhq!3071
\| \| * \| \| \| \| \|	Add DNS rebinding protection settings	Oswaldo Ferreira	2019-05-30	13	-13/+179
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Protect Gitlab::HTTP against DNS rebinding attack	Douwe Maan	2019-05-30	29	-90/+419
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::HTTP now resolves the hostname only once, verifies the IP is not blocked, and then uses the same IP to perform the actual request, while passing the original hostname in the `Host` header and SSL SNI field.
\| * \| \| \| \| \| \|	Merge branch 'security-fix-project-existence-disclosure-master' into 'master'	GitLab Release Tools Bot	2019-06-03	3	-16/+28
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix url redaction for issue links See merge request gitlab/gitlabhq!3091
\| \| * \| \| \| \| \| \|	Fix url redaction for issue links	Patrick Derichs	2019-05-03	3	-16/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry Add missing href to all redactor specs and removed href assignment Remove obsolete spec If original_content is given, it should be used for link content
\| * \| \| \| \| \| \| \|	Merge branch 'security-unsubscribing-from-issue' into 'master'	GitLab Release Tools Bot	2019-06-03	4	-11/+109
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide issue title on unsubscribe for anonymous users See merge request gitlab/gitlabhq!3097
\| \| * \| \| \| \| \| \| \|	Hide issue title on unsubscribe for anonymous users	Alexandru Croitor	2019-05-16	4	-11/+109
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'security-fix-confidential-issue-label-visibility-master' into ↵	GitLab Release Tools Bot	2019-06-03	3	-1/+46
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix confidential issue label disclosure on milestone view See merge request gitlab/gitlabhq!3098
\| \| * \| \| \| \| \| \| \|	Fix confidential issue label disclosure on milestone view	Patrick Derichs	2019-05-14	3	-1/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry Method should be public Use milestonish method Use render data to filter labels Add specs for label visibility on milestone
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.9.12	GitLab Release Tools Bot	2019-05-30	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-pages' into 'master'	Douglas Barbosa Alexandre	2019-06-03	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v1.6.0 See merge request gitlab-org/gitlab-ce!29048
\| * \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v1.6.0	Nick Thomas	2019-06-03	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ac-graphql-stats' into 'master'	Dmitriy Zaporozhets	2019-06-03	20	-5/+362
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Namespace and ProjectStatistics to GraphQL API See merge request gitlab-org/gitlab-ce!28277
\| * \| \| \| \| \| \| \| \| \| \|	Add Namespace and ProjectStatistics to GraphQL API	Alessio Caiazza	2019-06-03	20	-5/+362
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can query namespaces, and nested projects. Projects now exposes statistics
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue/51022' into 'master'	Annabel Dunstone Gray	2019-06-03	4	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added `dropdown-extended-height` class to labels dropdown-menu See merge request gitlab-org/gitlab-ce!28659
\| * \| \| \| \| \| \| \| \| \| \| \|	Add `dropdown-extended-height` class to labels dropdown	Michel Engelen	2019-06-03	4	-3/+8
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'abstract-auto-merge' into 'master'	Kamil Trzciński	2019-06-03	37	-187/+490
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and abstract Auto Merge Processes See merge request gitlab-org/gitlab-ce!28595
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix frontend tests related to autoMergeStrategyabstract-auto-merge	Nathan Friend	2019-06-03	7	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A few minor frontend changes to complete the refactoring from MWPS to the more generic autoMergeStrategy.
\| * \| \| \| \| \| \| \| \| \| \| \|	Abstract auto merge processes	Shinya Maeda	2019-06-03	35	-175/+478
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '11759-api-dependencies-list-mvc' into 'master'	Sean McGivern	2019-06-03	1	-0/+422
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dependency_list report fixture See merge request gitlab-org/gitlab-ce!29025
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add dependency_list report fixture	Tetiana Chupryna	2019-06-03	1	-0/+422
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-fj-11886-fix-port-validation' into 'master'	Kamil Trzciński	2019-06-03	3	-1/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix port validations in .gitlab-webide.yml See merge request gitlab-org/gitlab-ce!29016
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validation	Francisco Javier López	2019-06-01	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'qa-review-knapsack' into 'master'	Rémy Coutable	2019-06-03	8	-1/+100
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Run review-qa-all in parallel See merge request gitlab-org/gitlab-ce!28283
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate knapsack report for review-qa-all	Mark Lapierre	2019-06-03	8	-1/+100
\|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add knapsack qa report and use it to run tests in parallel Use the RSpec runner with knapsack The way the Knapsack runner uses exec to start rspec seems incompatible with the way we expect it to work. Plus, it requires specifying KNAPSACK_TEST_DIR. Instead, we use knapsacks AllocatorBuilder to select the spec files to run, and then start rspec as normal, via RSpec::Core::Runner.run This also means we can incorporate tags. Let the job run automatically Include KNAPSACK_TEST_FILE_PATTERN in vars Check all defined knapsack env vars before requiring knapsack
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-58714' into 'master'	Yorick Peterse	2019-06-03	3	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration failure when groups are missing route Closes #58714 See merge request gitlab-org/gitlab-ce!29022
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration failure when groups are missing routesh-fix-issue-58714	Stan Hu	2019-06-01	3	-1/+7
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a Group is missing a route, the migration failed previously with a `Invalid single-table inheritance type` error. To fix this, we can disable STI for the migration class because we don't need to know about the type to do this migration. Besides, currently Group is the only type used in the type column. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58714
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-search-dropdown-blur-close' into 'master'	Filipa Lacerda	2019-06-03	4	-2/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search dropdown not closing on blur if empty Closes #53741 See merge request gitlab-org/gitlab-ce!28730
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix search dropdown not closing on blur if emptyfix-search-dropdown-blur-close	Luke Bennett	2019-05-31	4	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '59854-fix-forms-stylint-issues' into 'master'	Filipa Lacerda	2019-06-03	3	-106/+61
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix style-lint errors and warnings for `app/assets/stylesheets/framework/forms.scss` Closes #59854 See merge request gitlab-org/gitlab-ce!28129
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove responsive column classes for sm screens59854-fix-forms-stylint-issues	Enrique Alcantara	2019-05-30	2	-38/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|