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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace events index with partial oneab/partial-events-index	Andreas Brandl	2019-09-12	3	-1/+25
\| \| \| \| \| \| \| \| \|	This improves the index size by removing all records with `group_id` from the index. On GitLab.com this means reducing the size from 9 GB to 8kb (as long as the column stays mostly null). Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32826#note_214690051
*	Merge branch 'use-background-migration-for-self-monitoring-project' into ↵	Andreas Brandl	2019-09-12	4	-214/+251
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	'master' Create self-monitoring project in background migration See merge request gitlab-org/gitlab-ce!32819
\| *	Create self-monitoring project in background migration	Reuben Pereira	2019-09-12	4	-214/+251
\|/ \| \| \| \|	- A regular migration caused problems such as https://gitlab.com/charts/gitlab/issues/1565.
*	Merge branch '61841-fix-encoding-error-in-mr-diffs' into 'master'	Nick Thomas	2019-09-12	3	-14/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix encoding error in MR diffs Closes #61841 See merge request gitlab-org/gitlab-ce!32862
\| *	Fix encoding error in MR diffs	Hiroyuki Sato	2019-09-10	3	-14/+52
\| \|
* \|	Merge branch 'pl-rubocop-const-nil' into 'master'	Stan Hu	2019-09-12	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix code docs for RuboCop's helper methods See merge request gitlab-org/gitlab-ce!32937
\| * \|	Fix code docs for RuboCop's helper methods	Peter Leitzen	2019-09-12	1	-2/+2
\|/ / \| \| \| \| \| \|	`(const nil :Foo)` vs `(const nil? :Foo)`
* \|	Merge branch 'sh-add-index-members-expires' into 'master'	Andreas Brandl	2019-09-12	3	-1/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix member expiration not always working Closes #67286 See merge request gitlab-org/gitlab-ce!32951
\| * \|	Fix member expiration not always workingsh-add-index-members-expires	Stan Hu	2019-09-11	3	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Sidekiq job `RemoveExpiredMembersWorker` was failing to run in production because it was hitting statement timeouts because it was scanning all rows in order. On staging, where it used to scan 4 million rows, adding an index brought this down to only a few hundred rows. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67286
* \| \|	Merge branch 'track-usage-data-for-analytics-features' into 'master'12-3-auto-deploy-20190916	Peter Leitzen	2019-09-12	4	-0/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setup counter for Productivity Analytics See merge request gitlab-org/gitlab-ce!32915
\| * \| \|	Setup counter for Productivity Analytics	Adam Hegyi	2019-09-12	4	-0/+20
\|/ / / \| \| \| \| \| \| \| \| \|	This change sets up a usage counter for productivity analytics feature.
* \| \|	Merge branch 'mishunov-master-patch-90654' into 'master'	Filipa Lacerda	2019-09-12	3	-3/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed padding from project filter field See merge request gitlab-org/gitlab-ce!32706
\| * \| \|	Removed padding from project filter field	Denys Mishunov	2019-09-12	3	-3/+7
\|/ / / \| \| \| \| \| \| \| \| \|	Resolves a regression caused by https://bit.ly/2k1GozA
* \| \|	Merge branch 'fix-merge-request-spec' into 'master'	Filipa Lacerda	2019-09-12	1	-3/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix merge_request_spec test See merge request gitlab-org/gitlab-ce!32867
\| * \| \|	Fix missing setTimeout in specfix-merge-request-spec	Illya Klymov	2019-09-10	1	-3/+5
\| \| \| \|
* \| \| \|	Merge branch ↵	Rémy Coutable	2019-09-12	3	-2/+49
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'50847-automatically-created-mr-uses-wrong-source-branch-when-branching-from-tag' into 'master' Resolve "Automatically created MR uses wrong source branch (when branching from Tag)" Closes #50847 See merge request gitlab-org/gitlab-ce!32392
\| * \| \| \|	Fix create MR from issue using a tag as ref	🙈 jacopo beschi 🙉	2019-09-12	3	-2/+49
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creating a MR from an issue using a tag as ref correctly creates the source branch starting from the tag.
* \| \| \|	Merge branch 'jheimbuck_gl-master-patch-11921' into 'master'	Evan Read	2019-09-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Typo fix 'Sempahore' to 'Semaphore' See merge request gitlab-org/gitlab-ce!32822
\| * \| \| \|	Typo fix 'Sempahore' to 'Semaphore'	James Heimbuck	2019-09-12	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch '66454-job-log-component' into 'master'	Kushal Pandya	2019-09-12	12	-60/+511
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates job log component See merge request gitlab-org/gitlab-ce!32764
\| * \| \| \|	Creates job log component	Filipa Lacerda	2019-09-12	12	-60/+511
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates vue and vuex support for new job log Creates the new log.vue component to handle the new format Updates the store to use the new parser Creates an utility function to handle the incremental log
* \| \| \|	Merge branch 'sh-revert-graphiql-version' into 'master'	Kamil Trzciński	2019-09-12	3	-13/+95
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make /-/graphql-explorer work again See merge request gitlab-org/gitlab-ce!32952
\| * \| \| \|	Add CSP nonce to graphiql-rails JavaScriptsh-revert-graphiql-version	Stan Hu	2019-09-11	2	-3/+5
\| \| \| \| \|
\| * \| \| \|	Revert "Update to graphiql-rails v1.7.10"	Stan Hu	2019-09-11	3	-13/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f222e74d455ec9fc10efb783ffe4684836cc1c3b.
* \| \| \| \|	Merge branch 'fix-interruptible-scope-name' into 'master'	Kamil Trzciński	2019-09-12	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes non interruptible scope name See merge request gitlab-org/gitlab-ce!32940
\| * \| \| \| \|	Fixes non interruptible scope name	Cédric Tabin	2019-09-12	2	-2/+2
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-invalid-formdata-usage' into 'master'	Kushal Pandya	2019-09-12	2	-7/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid usage of FormData in karma tests See merge request gitlab-org/gitlab-ce!32865
\| * \| \| \| \|	Fix FormData usage in karma testsfix-invalid-formdata-usage	Illya Klymov	2019-09-10	2	-7/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'create-amazon-eks-cluster-form-skeleton' into 'master'	Kushal Pandya	2019-09-12	19	-8/+156
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create EKS cluster Vue app skeleton See merge request gitlab-org/gitlab-ce!32479
\| * \| \| \| \| \|	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 'bw-asset-proxy-markdown-bump' into 'master'	Jan Provaznik	2019-09-12	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump the CACHE_COMMONMARK_VERSION See merge request gitlab-org/gitlab-ce!32935
\| * \| \| \| \| \| \|	Bump the CACHE_COMMONMARK_VERSIONbw-asset-proxy-markdown-bump	Brett Walker	2019-09-11	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to ensure any markdown generated before the asset proxy default was corrected is re-generated
* \| \| \| \| \| \| \|	Merge branch '62122-hide-resolve-thread-button-from-guest' into 'master'	Kushal Pandya	2019-09-12	5	-1/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide resolve thread button from guest Closes #62122 See merge request gitlab-org/gitlab-ce!32859
\| * \| \| \| \| \| \| \|	Hide resolve thread button from guest	Samantha Ming	2019-09-12	5	-1/+29
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Show if user can_resolve all of the notes
* \| \| \| \| \| \| \|	Merge branch 'fix-missing-listissue' into 'master'	Kushal Pandya	2019-09-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing ListIssue import See merge request gitlab-org/gitlab-ce!32850
\| * \| \| \| \| \| \| \|	Add missing ListIssue importfix-missing-listissue	Illya Klymov	2019-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'da-geo-high-availability-docs' into 'master'	Evan Read	2019-09-12	1	-2/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Geo - Update HA docs to recommend Gitaly over NFS See merge request gitlab-org/gitlab-ce!32912
\| * \| \| \| \| \| \| \|	Update Geo HA docs to recommend Gitaly over NFSda-geo-high-availability-docs	Douglas Barbosa Alexandre	2019-09-11	1	-2/+6
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'qa-ml-fix-nplus-pipeline' into 'master'	Sanad Liaquat	2019-09-12	2	-3/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing E2E N+1 pipelines See merge request gitlab-org/gitlab-ce!32913
\| * \| \| \| \| \| \|	Update test to not try to sign out	Mark Lapierre	2019-09-12	2	-3/+9
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because it will already be signed out
* \| \| \| \| \| \|	Merge branch 'migrate-diff-file-header-tests' into 'master'	Mike Greiling	2019-09-12	4	-756/+489
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate DiffFileHeader tests to Jest Closes #67073 See merge request gitlab-org/gitlab-ce!32798
\| * \| \| \| \| \| \|	Refactor DiffFileHeader tests	Illya Klymov	2019-09-12	4	-756/+489
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Switched from Karma to Jest * Reorganized tests to have correct semantics * Removed unused computed properties from component
* \| \| \| \| \| \|	Merge branch 'docs-add-note-terminals' into 'master'	Evan Read	2019-09-12	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about incompatibility of session_server with runner helm chart See merge request gitlab-org/gitlab-ce!32916
\| * \| \| \| \| \| \|	Add note about incompatibility of session_server with runner helm chart	Alexander Tanayno	2019-09-12	1	-0/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'qa-wiki-ssh-spec' into 'master'	Mark Lapierre	2019-09-12	5	-2/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of E2E Test wiki SSH push to Geo primary node See merge request gitlab-org/gitlab-ce!32885
\| * \| \| \| \| \| \|	Update qa resources and pages for Geo wiki specqa-wiki-ssh-spec	Jennie Louie	2019-09-10	5	-2/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add qa selectors to wiki show and ssh keys page Add method to wiki push resource to find ssh_uri
* \| \| \| \| \| \| \|	Merge branch 'docs-project-membership-mpenna20190906' into 'master'	Evan Read	2019-09-12	1	-8/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Clarified project membership terminology See merge request gitlab-org/gitlab-ce!32784
\| * \| \| \| \| \| \| \|	Docs: Clarified project membership terminology	Matt Penna	2019-09-12	1	-8/+12
\|/ / / / / / / /