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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"revert-a3fd1a13	Jan Provaznik	2019-04-02	1	-35/+0
\| \| \|	This reverts merge request !26569
*	Stop calling UnlinkRepositoryFromObjectPool RPC	Jacob Vosmaer	2019-04-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59777. In earlier iterations of our implementation of Git object deduplication we thought we would be making extensive use of Git remotes in pool repositories in the future, and that we should manage these remotes carefully from the start. We now expect we only care about one remote, namely the source project. The other remotes are there only for forensic purposes. Before this MR we tried to also remove pool remotes when member projects got deleted, with the UnlinkRepositoryFromObjectPool RPC. This is fragile when there are race conditions (see https://gitlab.com/gitlab-org/gitaly/issues/1568#note_153955926). We have spent some time making this RPC less fragile in https://gitlab.com/gitlab-org/gitaly/merge_requests/1151 but looking at this problem again, I think we should just stop calling it.
*	Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'	Robert Speicher	2019-04-02	21	-56/+597
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Jarv/dev to gitlab 2019 04 02 Closes #2810 See merge request gitlab-org/gitlab-ce!26846
\| *	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02	John Jarvis	2019-04-02	21	-56/+597
\| \|\ \| \| \| \| \| \| \| \| \|	jarv/dev-to-gitlab-2019-04-02
\| \| *	Rake task for removing exif from uploads	Jan Provaznik	2019-04-02	1	-0/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a rake task which can be used for removing EXIF data from existing uploads.
\| \| *	Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-0/+15
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2977
\| \| \| *	Fix XSS in resolve conflicts form	Paul Slaughter	2019-03-07	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
\| \| * \|	Merge branch 'security-56224' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-1/+35
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!2996
\| \| \| * \|	Hide related branches when user does not have permission	Mark Chao	2019-03-21	1	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guest user of a project should not see branches
\| \| * \| \|	Merge branch 'security-id-potential-denial-languages' into 'master'	GitLab Release Tools Bot	2019-04-02	5	-5/+72
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return cached languages if they've been detected before See merge request gitlab/gitlabhq!2998
\| \| \| * \| \|	Return cached languages if they've been detected before	Igor Drozdov	2019-03-20	5	-5/+72
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'	GitLab Release Tools Bot	2019-04-02	2	-3/+3
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PDF.js vulnerability See merge request gitlab/gitlabhq!2999
\| \| \| * \| \| \|	Fixed pdf tests	Natalia Tepluhina	2019-03-13	2	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'security-use-untrusted-regexp' into 'master'	GitLab Release Tools Bot	2019-04-02	7	-47/+121
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use UntrustedRegexp for CI refs matching See merge request gitlab/gitlabhq!3005
\| \| \| * \| \| \| \|	Make CI refs matching to to use UntrustedRegexp	Kamil Trzciński	2019-03-15	7	-47/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
\| \| * \| \| \| \| \|	Merge branch 'security-milestone-labels' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-0/+86
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Check label_ids parent when updating issue board See merge request gitlab/gitlabhq!3027
\| \| \| * \| \| \| \| \|	Check if labels are available for target issuable	Jarka Košanová	2019-03-28	1	-0/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- labels have to be in the same project/group as an issuable
\| \| * \| \| \| \| \| \|	Merge branch 'security-mass-assignment-on-project-update' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-0/+17
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3028
\| \| \| * \| \| \| \| \| \|	Refactor specs according to the code review	Małgorzata Ksionek	2019-03-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Add cr remarks	Małgorzata Ksionek	2019-03-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Disallow changing namespace of a project in update method	Małgorzata Ksionek	2019-03-20	1	-0/+17
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Disallow guest users from accessing Releases	Shinya Maeda	2019-03-26	2	-2/+40
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As they do not have a permission to read git tag
* \| \| \| \| \| \| \|	Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'	Kamil Trzciński	2019-04-02	3	-42/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Expose merge request pipeline parameters for MR widget See merge request gitlab-org/gitlab-ce!26826
\| * \| \| \| \| \| \| \|	Backport EE changeexpose-mr-pipeline-parameters-for-merge-widget-ce	Shinya Maeda	2019-04-02	3	-42/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for merge request pipelines
* \| \| \| \| \| \| \| \|	Backport splitting approval changes from CE	Igor	2019-04-02	2	-28/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Author and committers approvals are split in EE This commit provides backports for those changes This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
* \| \| \| \| \| \| \| \|	Monitor GraphQL with Prometheus	Jan Provaznik	2019-04-02	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-rugged-tree-entries' into 'master'	Sean McGivern	2019-04-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid excessive recursive calls with Rugged TreeEntries Closes #59759 See merge request gitlab-org/gitlab-ce!26813
\| * \| \| \| \| \| \| \| \|	Avoid excessive recursive calls with Rugged TreeEntriessh-fix-rugged-tree-entries	Stan Hu	2019-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Rugged implementation was recursively scanning the repository to create `flat_path` because the post-process step was being called from with a loop. For large repositories, this was significantly slowing things down. Break the call to `rugged_populate_flat_path` out of this loop to make this work efficiently. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59759
* \| \| \| \| \| \| \| \| \|	Merge branch 'issue_51789_part_1' into 'master'	Sean McGivern	2019-04-02	4	-2/+115
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
\| * \| \| \| \| \| \| \| \|	Address review comments	Felipe Artur	2019-03-28	1	-17/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge master	Felipe Artur	2019-03-27	852	-5981/+24587
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Remove auto vacuum logic, decrease batch size and interval	Felipe Artur	2019-03-01	1	-33/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Address review comments	Felipe Artur	2019-02-19	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into issue_51789_part_1	Felipe Artur	2019-02-19	126	-923/+3008
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add more specs and code improvements	Felipe Artur	2019-02-19	1	-16/+37
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make migrations reschedulable	Felipe Artur	2019-02-18	1	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add Reschedulable module	Felipe Artur	2019-02-15	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix specs	Felipe Artur	2019-02-15	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add specs for issuable states sync	Felipe Artur	2019-02-14	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Split background migration for issues and merge requests	Felipe Artur	2019-02-14	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Schedule background migrations and specs	Felipe Artur	2019-02-12	1	-48/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Migrate issuable states to integer patch 1	Felipe Artur	2019-02-11	1	-0/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch 1 that migrates issues/merge requests states from integer to string. On this commit we are only adding the state_id column and syncing it with a backgroud migration. On Patch 2 the code to use the new integer column will be deployed and the old column will be removed.
* \| \| \| \| \| \| \| \| \| \| \|	Add new field to Clusters table	Mayra Cabrera	2019-04-02	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds boolean field 'managed' to clusters table. This new column will be used to distinguish those clusters that are automatically managed by gitlab. Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* \| \| \| \| \| \| \| \| \| \| \|	Fix group transfer selection possibilities	Peter Marko	2019-04-02	1	-0/+33
\| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-stream-io-into-gitaly' into 'master'	Nick Thomas	2019-04-01	1	-2/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow streaming io objects into Gitaly See merge request gitlab-org/gitlab-ce!26738
\| * \| \| \| \| \| \| \| \| \| \|	Allow streaming io objects into Gitaly	Bob Van Landuyt	2019-04-01	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to set the encoding of an IO passed without reading it into memory. This is useful if we want to stream files into Gitaly. Like we do when uploading a new file to the repository.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-rejected-jest-promises' into 'master'	Fatih Acet	2019-04-01	2	-4/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fail Jest tests for unhandled Promise rejections Closes #56053 See merge request gitlab-org/gitlab-ce!26424
\| * \| \| \| \| \| \| \| \| \| \| \|	Fail correct test for Promisewinh-rejected-jest-promises	Winnie Hellmann	2019-03-29	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fail for unhandled Promise rejections in Jest	Winnie Hellmann	2019-03-29	2	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Add jQuery matchers to Jest	Winnie Hellmann	2019-04-01	2	-1/+9
\| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|