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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Drop legacy artifacts usagedrop-usage-of-leagcy-artifacts	Shinya Maeda	2019-04-04	1	-1/+1
\| \| \| \| \| \|	Legacy artifacts have been correctly migrated to new place - ci_job_artifacts. Now it's time to remove the related code, but before that we should ensure it doesn't break anything by using feature flag.
*	Merge branch '10864-fix-undefined-with-fallback' into 'master'	Lin Jen-Shin	2019-04-03	1	-0/+13
\|\ \| \| \| \| \| \| \| \|	Backport: Bring back Gitlab::UntrustedRegexp.with_fallback See merge request gitlab-org/gitlab-ce!26901
\| *	Bring back Gitlab::UntrustedRegexp.with_fallback10864-fix-undefined-with-fallback	Patrick Bajao	2019-04-03	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	It's still being called in PushRule model. Also still present in 11-9-stable-ee branch.
* \|	Merge branch 'remaining-lib-differences' into 'master'	Robert Speicher	2019-04-03	1	-0/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve remaining CE to EE differences in lib/ See merge request gitlab-org/gitlab-ce!26608
\| * \|	Backport EE changes to gitlab:env:inforemaining-lib-differences	Yorick Peterse	2019-04-02	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports EE specific changes for the Rake task `gitlab:env:info`, wrapping them in a conditional. There is no way to inject code in the middle of a Rake task in EE, so unfortunately this is the best we can do.
* \| \|	Add port section to CI Image object	Francisco Javier López	2019-04-03	13	-12/+294
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179 we need several modifications on the CI config file. We are adding a new ports section in the default Image object. Each of these ports will accept: number, protocol and name. By default this new configuration will be only enabled in the Web IDE config file.
* \| \|	Merge branch '47234-composable-auto-devops' into 'master'	Dmitriy Zaporozhets	2019-04-03	11	-914/+768
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Composable Auto DevOps" Closes #47234 See merge request gitlab-org/gitlab-ce!26520
\| * \|	Add required variables to Jobs/Build.gitlab-ci.yml47234-composable-auto-devops	Tiger	2019-04-02	2	-11/+20
\| \| \|
\| * \|	Split Security Auto DevOps jobs into templates	Tiger	2019-04-02	6	-252/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Container Scanning, Dependency Scanning, License Management and SAST parts of Auto DevOps now use the preexisting templates. Auto DevOps and the DAST job template will now use a shared job template instead of maintaining two copies of the job. This also allows Auto DevOps to use custom authentication with DAST.
\| * \|	Split non-security Auto-DevOps jobs into templates	Tiger	2019-04-02	6	-662/+678
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows these templates to be used outside of Auto DevOps, or easily excluded from Auto DevOps. The security jobs in Auto DevOps differ slightly from the ones that are already available as templates, they will be moved next.
* \| \|	Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"	Jan Provaznik	2019-04-02	1	-43/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26569
* \| \|	Stop calling UnlinkRepositoryFromObjectPool RPC	Jacob Vosmaer	2019-04-02	2	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	10	-54/+237
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	10	-54/+237
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	jarv/dev-to-gitlab-2019-04-02
\| \| * \|	Rake task for removing exif from uploads	Jan Provaznik	2019-04-02	2	-0/+174
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a rake task which can be used for removing EXIF data from existing uploads.
\| \| * \|	Merge branch 'security-id-potential-denial-languages' into 'master'	GitLab Release Tools Bot	2019-04-02	2	-5/+4
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-5/+4
\| \| \| \| \|
\| \| * \| \|	Merge branch 'security-use-untrusted-regexp' into 'master'	GitLab Release Tools Bot	2019-04-02	6	-49/+59
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-49/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
* \| \| \| \| \|	Monitor GraphQL with Prometheus	Jan Provaznik	2019-04-02	1	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-8/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+44
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate issuable states to integer patch 1 of 2 Closes #51789 See merge request gitlab-org/gitlab-ce!25107
\| * \| \| \| \| \|	Remove additional loggingissue_51789_part_1	Felipe Artur	2019-04-01	2	-4/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Address review comments	Felipe Artur	2019-03-28	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge master	Felipe Artur	2019-03-27	267	-1864/+4843
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove auto vacuum logic, decrease batch size and interval	Felipe Artur	2019-03-01	3	-102/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Address review comments	Felipe Artur	2019-02-19	6	-72/+93
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into issue_51789_part_1	Felipe Artur	2019-02-19	44	-126/+448
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add more specs and code improvements	Felipe Artur	2019-02-19	4	-29/+32
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make migrations reschedulable	Felipe Artur	2019-02-18	4	-27/+47
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix typo	Felipe Artur	2019-02-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix rubocop	Felipe Artur	2019-02-18	4	-52/+61
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Reschedulable module	Felipe Artur	2019-02-15	3	-31/+58
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Split background migration for issues and merge requests	Felipe Artur	2019-02-14	3	-10/+28
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Schedule background migrations and specs	Felipe Artur	2019-02-12	2	-6/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Migrate issuable states to integer patch 1	Felipe Artur	2019-02-11	2	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \|	Merge branch 'kube_helm_auto_devops_213' into 'master'	Kamil Trzciński	2019-04-02	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!26534
\| * \| \| \| \| \| \| \| \|	Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.ymlkube_helm_auto_devops_213	Thong Kuah	2019-04-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix attempting to drop views in PostgreSQLweimeng-master-patch-83366	Wei-Meng Lee	2019-04-02	1	-1/+4
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Allow streaming io objects into Gitaly	Bob Van Landuyt	2019-04-01	4	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'jc-remove-find-all-tags-ff' into 'master'	Douglas Barbosa Alexandre	2019-04-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove find all tags feature flag See merge request gitlab-org/gitlab-ce!26746
\| * \| \| \| \| \| \| \| \|	Remove find all tags feature flagjc-remove-find-all-tags-ff	John Cai	2019-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-container-scanning-on-k8s' into 'master'	Douglas Barbosa Alexandre	2019-04-01	2	-6/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Container Scanning for Kubernetes Runners Closes gitlab-ee#5763 and gitlab-ee#6636 See merge request gitlab-org/gitlab-ce!26793
\| * \| \| \| \| \| \| \| \| \|	Fix Container Scanning for Kubernetes Runnersfix-container-scanning-on-k8s	Philippe Lafoucrière	2019-03-31	2	-6/+18
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6636 closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5763
* \| \| \| \| \| \| \| \| \|	Include cluster domain into Project Cluster API	Mayra Cabrera	2019-04-01	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Domain was introduced on 11.8 and was not included on the Project Cluster API. With this change user will be able to include domain when adding and updating a cluster. Domain will also be included on the GET calls. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59441
* \| \| \| \| \| \| \| \| \|	Merge branch 'enable-rubocop-application-record' into 'master'	Lin Jen-Shin	2019-04-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document ApplicationRecord / pluck_primary_key Closes #59690 See merge request gitlab-org/gitlab-ce!26764
\| * \| \| \| \| \| \| \| \|	Document ApplicationRecord / pluck_primary_key	Nick Thomas	2019-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We also enable the rubocop that makes it mandatory
* \| \| \| \| \| \| \| \| \|	Fix API /project/:id/branches not returning correct merge status	Stan Hu	2019-03-30	1	-2/+2
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24034 introduced a regression where only the first 20 branches were used to determine whether a branch has been merged because the pagination was applied incorrectly. Requesting the second page of branches via the API would always have the wrong merge status. We fix this by properly paginating the branches before requesting their merge status. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250
* \| \| \| \| \| \| \| \|	Handle missing keys in sentry api response	Reuben Pereira	2019-03-29	1	-11/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Do not raise error when there are missing non-essential keys in sentry api response. - Add specs for to check for missing keys behavior.