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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Include AWS SDK as packge dependencycreate-amazon-eks-cluster-form-skeleton	Enrique Alcantara	2019-09-11	5	-14/+63
\| \| \| \| \|	- Load EKS create cluster form as dynamic import dependency. - Include aws-sdk dependency in package.json
*	Remove service credentials object	Enrique Alcantara	2019-09-11	1	-4/+0
\|
*	Create EKS cluster Vue app skeleton	Enrique Alcantara	2019-09-11	17	-0/+103
\| \| \| \| \| \|	- Add AWS SDK Dependency - Create placeholders for Vue components - Create store with state structure
*	Merge branch '64799-disable-transfer-group' into 'master'	Clement Ho	2019-09-11	7	-7/+68
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Disable "transfer group" button when no parent group is selected Closes #64799 See merge request gitlab-org/gitlab-ce!31387
\| *	Disable "transfer group" button when no parent group is selected	Jan Beckmann	2019-09-11	7	-7/+68
\|/ \| \| \| \| \|	Refactor project_edit.js to be reusable for this purpose Closes #64799
*	Merge branch 'docs-ameliabauerly-master-patch-26994' into 'master'	Achilleas Pipinellis	2019-09-11	1	-0/+17
\|\ \| \| \| \| \| \| \| \|	Update Prometheus set up steps See merge request gitlab-org/gitlab-ce!32898
\| *	Update Prometheus set up steps	Amelia Bauerly	2019-09-11	1	-0/+17
\|/
*	Merge branch '61927-pages-custom-domain-virtual-domain' into 'master'	Kamil Trzciński	2019-09-11	15	-9/+358
\|\ \| \| \| \| \| \| \| \|	Add support for custom domains to the Pages internal API See merge request gitlab-org/gitlab-ce!32735
\| *	Add tests for ProjectFeature's #public_pages? and #private_pages?61927-pages-custom-domain-virtual-domain	Krasimir Angelov	2019-09-11	1	-0/+54
\| \|
\| *	Add tests for Project#pages_lookup_path	Krasimir Angelov	2019-09-11	1	-0/+11
\| \|
\| *	Add tests for PagesDomain#pages_virtual_domain	Krasimir Angelov	2019-09-11	1	-0/+12
\| \|
\| *	Add tests for Pages::VirtualDomain	Krasimir Angelov	2019-09-11	1	-0/+43
\| \|
\| *	Add support for custom domains to the internal Pages API	Krasimir Angelov	2019-09-10	11	-9/+238
\| \| \| \| \| \| \| \| \| \|	Update the `/internal/pages` endpoint to return virtual domain configuration for custom domains.
* \|	Merge branch 'add-larger-ci-buckets' into 'master'	Kamil Trzciński	2019-09-11	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 30 and 60 minute buckets Closes #67218 See merge request gitlab-org/gitlab-ce!32833
\| * \|	Add 30 and 60 minute buckets	Elliot Rushton	2019-09-11	1	-1/+1
\|/ /
* \|	Merge branch 'migrate_promoted_epics_discussion_ids-ce' into 'master'	Nick Thomas	2019-09-11	4	-0/+214
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Port CE: Migrate discussion_ids on promoted epics See merge request gitlab-org/gitlab-ce!30810
\| * \|	Change discussion_ids on promoted epics notes	Alexandru Croitor	2019-09-11	4	-0/+214
\|/ / \| \| \| \| \| \| \| \| \| \|	Notes on epics promoted from an issue used to get same discussion_id as the notes from the issue the epic was promoted from, which would cause problems when trying to reply to the epic discussion.
* \|	Merge branch '13085-license-information-in-dependency-list-add-docs' into ↵	Achilleas Pipinellis	2019-09-11	4	-1/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update docs for added licenses in dependency list See merge request gitlab-org/gitlab-ce!32389
\| * \|	Update docs for licenses in dependency list13085-license-information-in-dependency-list-add-docs	Dave Pisek	2019-09-11	4	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commits updates the docs (text and screenshot) to include information about the added display of licenses for a given dependency.
* \| \|	Merge branch 'docs-merge-examples-with-features-2' into 'master'	Achilleas Pipinellis	2019-09-11	2	-123/+107
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge code quality docs together See merge request gitlab-org/gitlab-ce!32737
\| * \| \|	Merge code quality example config with main doc	Marcel Amirault	2019-09-11	2	-123/+107
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Bring the example config and the main doc together to simplify documentation for code quality
* \| \|	Merge branch 'docs-its-relative-10' into 'master'	Achilleas Pipinellis	2019-09-11	7	-11/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change several links to relative See merge request gitlab-org/gitlab-ce!32919
\| * \| \|	Change links to relative	Marcel Amirault	2019-09-11	7	-11/+11
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Make several links, mostly in admin troubleshooting, relative, as is the standard
* \| \|	Merge branch 'do-not-retry-review-jobs-failures' into 'master'	Lin Jen-Shin	2019-09-11	1	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't retry the review-* jobs since they're allowed to fail See merge request gitlab-org/gitlab-ce!32893
\| * \| \|	Don't retry the review-* jobs since they're allowed to faildo-not-retry-review-jobs-failures	Rémy Coutable	2019-09-10	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retrying these jobs only make the pipelines longer without any added benefit. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'docs-62122-non-member-resolve-unresolve-discussion' into 'master'	Marcia Ramos	2019-09-11	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs for non member unresolving resolved thread See merge request gitlab-org/gitlab-ce!32375
\| * \| \| \|	Update docs for non member unresolving resolved thread	Samantha Ming	2019-09-11	1	-0/+3
\|/ / / /
* \| \| \|	Merge branch 'remove-cluttered-api-helpers-module' into 'master'	Rémy Coutable	2019-09-11	4	-8/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not include ApiHelpers again in spec/requests/api See merge request gitlab-org/gitlab-ce!32870
\| * \| \| \|	Do not include ApiHelpers again in spec/requests/api	Dinesh Panda	2019-09-11	4	-8/+0
\|/ / / /
* \| \| \|	Merge branch 'dz-fix-add-cluster-doc-links' into 'master'	Kushal Pandya	2019-09-11	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix doc links for adding a cluster to a project See merge request gitlab-org/gitlab-ce!32890
\| * \| \| \|	Fix doc links for adding a cluster to a projectdz-fix-add-cluster-doc-links docs/dz-fix-cluster-doc-links	Dmitriy Zaporozhets	2019-09-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch '65940-run-pipeline' into 'master'	Kushal Pandya	2019-09-11	18	-43/+496
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Run pipeline button for "Pipelines for merge requests"" Closes #65940 See merge request gitlab-org/gitlab-ce!31722
\| * \| \| \| \|	Enables Run Pipeline button to be rendered	Filipa Lacerda	2019-09-11	18	-43/+496
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the Merge Request view, under pipelines tab the user can see a run pipeline button Adds axios post request to button click Adds the logic to handle the user click, refresh the table and disable the button while thee request is being made Updates UI for desktop and mobile Adds specs Regenerates potfile Follow-up after review Uses .finally to avoid code repetition
* \| \| \| \|	Merge branch 'sh-fix-oauth-application-page' into 'master'	Rémy Coutable	2019-09-11	8	-3/+69
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize /admin/applications so that it does not timeout Closes #67228 See merge request gitlab-org/gitlab-ce!32852
\| * \| \| \| \|	Optimize /admin/applications so that it does not timeoutsh-fix-oauth-application-page	Stan Hu	2019-09-09	8	-3/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On our dev instance, /admin/applications as not loading because: 1. There was an unindexed query by `application_id`. 2. There was an expensive query that attempted to load 1 million unique entries via ActiveRecord just to find the unique count. We fix the first issue by adding an index for that column. We fix the second issue with a simple SELECT COUNT(DISTINCT resource_owner_id) SQL query. In addition, we add pagination to avoid loading more than 20 applications at once. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
* \| \| \| \| \|	Merge branch 'qa-dockerignore-add-directories' into 'master'	Rémy Coutable	2019-09-11	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add additional dirs to QA image Dockerignore See merge request gitlab-org/gitlab-ce!32900
\| * \| \| \| \| \|	Add additional dirs to QA image Dockerignore	Aleksandr Soborov	2019-09-11	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch '65988-optimize-snippet-listings' into 'master'	Thong Kuah	2019-09-11	23	-162/+262
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize queries for snippet listings See merge request gitlab-org/gitlab-ce!32576
\| * \| \| \| \| \|	Add controller concern for paginated collections65988-optimize-snippet-listings	Markus Koller	2019-09-10	14	-133/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We had similar code in a few places to redirect to the last page if the given page number is out of range. This unifies the handling in a new controller concern and adds usage of it in all snippet listings.
\| * \| \| \| \| \|	Optimize queries for snippet listings	Markus Koller	2019-09-10	13	-30/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Avoid N+1 queries for authors and comment counts - Avoid an additional snippet existence query
* \| \| \| \| \| \|	Merge branch 'williamchia-master-patch-44268' into 'master'	Evan Read	2019-09-11	1	-3/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add instructions for defining stages See merge request gitlab-org/gitlab-ce!32896
\| * \| \| \| \| \| \|	Add instructions for defining stages	William Chia	2019-09-11	1	-3/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'geo-docker-reg-replication-docs' into 'master'	Evan Read	2019-09-11	2	-12/+102
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Geo: Docker Registry replication documentation (4/4) Closes gitlab-ee#2870 See merge request gitlab-org/gitlab-ce!31196
\| * \| \| \| \| \| \|	Geo: Docker Registry replication documentation (4/4)	Valery Sizov	2019-09-11	2	-12/+102
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2019-09-10	3	-1/+13
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'security-12-3-bump-pages' into 'master'	GitLab Release Tools Bot	2019-09-11	2	-1/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set max-age and secure flag for pages auth cookies See merge request gitlab/gitlabhq!3378
\| \| * \| \| \| \| \| \|	Upgrade pages to 1.8.1	Vladimir Shushlin	2019-09-09	2	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 12.2.5	GitLab Release Tools Bot	2019-09-10	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'ac-fix-graphiql-csp' into 'master'	Mayra Cabrera	2019-09-11	3	-3/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix graphql-explorer CSP violation See merge request gitlab-org/gitlab-ce!32882
\| * \| \| \| \| \| \| \| \|	Fix CSP failure patching graphiql view	Alessio Caiazza	2019-09-11	3	-3/+23
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backporting https://github.com/rmosolgo/graphiql-rails/pull/71