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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow partially migrated repositories to continue migration53700-hashed-storagemigration	Gabriel Mazetto	2018-11-15	3	-1/+14
\| \| \| \| \| \| \| \| \|	Previously we verified if the projecthave at least migrated their repository to hashed storage and prevented the migration command to start a new migration. The new version checks for the latest storage version available (fully migrated), otherwise it allows migration to be triggered again.
*	Merge branch 'fix-typos' into 'master'	Phil Hughes	2018-11-15	3	-3/+3
\|\ \| \| \| \| \| \| \| \|	Fix types comment See merge request gitlab-org/gitlab-ce!23107
\| *	Fix types comment	yukihir0	2018-11-15	3	-3/+3
\| \|
* \|	Merge branch '53626-update-config-map-on-install-retry' into 'master'	Kamil Trzciński	2018-11-15	3	-8/+36
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update config map if already present on install Closes #53626 See merge request gitlab-org/gitlab-ce!22969
\| * \|	Update config map if already present on install53626-update-config-map-on-install-retry	Thong Kuah	2018-11-15	3	-8/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When an application install fails, and the user retries install, the configmap for the application will already exists. If so, we simply update instead of create.
* \| \|	Merge branch 'remove-rails5-gemfile' into 'master'	Robert Speicher	2018-11-15	1	-7/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Gemfile.rails5 See merge request gitlab-org/gitlab-ce!23109
\| * \| \|	Remove Gemfile.rails5	Jan Provaznik	2018-11-15	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This file is not needed anymore (since we switched to rails 5 already).
* \| \| \|	Merge branch 'triggermesh-phase2-serverless' into 'master'	Kamil Trzciński	2018-11-15	5	-1/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add knative client to kubeclient library See merge request gitlab-org/gitlab-ce!22968
\| * \| \| \|	Add knative client to kubeclient library	Chris Baumbauer	2018-11-15	5	-1/+38
\|/ / / /
* \| \| \|	Merge branch 'ignore-environment-validation-failure' into 'master'	Kamil Trzciński	2018-11-15	4	-0/+78
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Ignore environment validation failure See merge request gitlab-org/gitlab-ce!23100
\| * \| \|	Ignore environment validation failure	Shinya Maeda	2018-11-15	4	-0/+78
\|/ / /
* \| \|	Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'	Douwe Maan	2018-11-15	2	-28/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 'comment_on_any_diff_line' feature flag Closes #54034 See merge request gitlab-org/gitlab-ce!23093
\| * \| \|	Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ff	Oswaldo Ferreira	2018-11-14	2	-28/+1
\| \|/ /
* \| \|	Merge branch 'osw-fallback-on-blank-refs' into 'master'	Grzegorz Bizon	2018-11-15	3	-1/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid Gitaly RPC errors when fetching diff stats Closes gitaly#1393 See merge request gitlab-org/gitlab-ce!22995
\| * \| \|	Avoid Gitaly RPC errors when fetching diff statsosw-fallback-on-blank-refs	Oswaldo Ferreira	2018-11-14	3	-1/+28
\| \| \| \|
* \| \| \|	Merge branch 'auto_devops_kubernetes_active' into 'master'	Grzegorz Bizon	2018-11-15	2	-10/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch kubernetes:active with checking $KUBECONFIG Closes gitlab-ee#8311 See merge request gitlab-org/gitlab-ce!22929
\| * \| \| \|	Use except:variables to fix multiple variable jobsauto_devops_kubernetes_active	Thong Kuah	2018-11-09	1	-20/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As `only:variables` has the effect of being satisfied by any one of variable expression - this will create a situation where e.g. the dast job will be active even if there's no cluster. So use `except:variables which requires each and every variable expression to be satisfied.
\| * \| \| \|	Switch kubernetes:active with checking $KUBECONFIG	Thong Kuah	2018-11-09	2	-10/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have found an issue with `kubernetes:active` where it doesn't work with multiple clusters. Switch with the similar $KUBECONFIG variable check but this check actually gets the variable from the cluster matching the environment name. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/8311
* \| \| \| \|	Merge branch '53491-fix-again' into 'master'	Sean McGivern	2018-11-15	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't care about order when getting awarded issues Closes #53491 See merge request gitlab-org/gitlab-ce!23101
\| * \| \| \| \|	Don't care about order when getting awarded issues	Toon Claes	2018-11-15	1	-2/+2
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing failing master: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/116776474
* \| \| \| \|	Merge branch 'fix-typo-in-admin-intergration' into 'master'	Sean McGivern	2018-11-15	30	-30/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a typo in Admin: intergration -> integration See merge request gitlab-org/gitlab-ce!23050
\| * \| \| \| \|	Fix a typo in Admin: intergration -> integrationfix-typo-in-admin-intergration	Vincent AUBERT	2018-11-14	30	-30/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vincent AUBERT <vincentaubert88@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'sh-structured-logs-docs' into 'master'	Sean McGivern	2018-11-15	2	-0/+145
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on how to use structured logging Closes #54059 See merge request gitlab-org/gitlab-ce!23031
\| * \| \| \| \| \|	Add missing space to logging docsh-structured-logs-docs	Stan Hu	2018-11-14	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Exclude qa and docs from Rails 4 builds	Stan Hu	2018-11-14	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
\| * \| \| \| \| \|	Add documentation on how to use structured logging	Stan Hu	2018-11-14	2	-0/+145
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'doc-pc-shortcut-webide' into 'master'	Achilleas Pipinellis	2018-11-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shortcuts documentation: Add the PC equivalent of the Mac's "Cmd" key in the WebIDE section See merge request gitlab-org/gitlab-ce!23064
\| * \| \| \| \| \| \|	Shortcuts documentation: Add the PC equivalent of the Mac's "Cmd" key in the ↵	Thomas Pathier	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WebIDE section This makes it consistent with the "Global" section of the file Signed-off-by: Thomas Pathier <tpxp@live.fr>
* \| \| \| \| \| \| \|	Merge branch 'leipert-master-patch-67614' into 'master'	Stan Hu	2018-11-15	1	-3/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to new security report syntax See merge request gitlab-org/gitlab-ce!23094
\| * \| \| \| \| \| \| \|	Update to new security report syntaxleipert-master-patch-67614	Lukas Eipert	2018-11-14	1	-3/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'notes-consistent-key-object-case' into 'master'	Filipa Lacerda	2018-11-15	40	-695/+676
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made diff & note data consistent See merge request gitlab-org/gitlab-ce!22950
\| * \| \| \| \| \| \| \| \|	Made diff & note data consistent	Phil Hughes	2018-11-14	40	-695/+676
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caused many pain points when working with it. Part of the data was camel cased the other snake case. Other parts where snake case & then getting converted in components, this conversion has the potential for leaking memory. This changes that & makes it consistent with what it returned from the API, snake case.
* \| \| \| \| \| \| \| \| \|	Merge branch '53882-extra-container-diff-version' into 'master'	Fatih Acet	2018-11-14	1	-2/+25
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix version system note Closes #53882 See merge request gitlab-org/gitlab-ce!23030
\| * \| \| \| \| \| \| \| \|	Tweak vertical line to line up with system notes and comment avatars53882-extra-container-diff-version	Annabel Dunstone Gray	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add back margin on discussion system notes	Annabel Dunstone Gray	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove box on diff tab system note	Annabel Dunstone Gray	2018-11-14	1	-0/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix version system note	Annabel Dunstone Gray	2018-11-14	1	-1/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-exclude-rails4-builds-from-docs' into 'master'	Douglas Barbosa Alexandre	2018-11-14	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude qa and docs from Rails 4 builds Closes #54059 See merge request gitlab-org/gitlab-ce!23091
\| * \| \| \| \| \| \| \| \|	Exclude qa and docs from Rails 4 builds	Stan Hu	2018-11-14	1	-0/+2
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
* \| \| \| \| \| \| \| \|	Merge branch 'dm-commit-email-select-options' into 'master'	Stan Hu	2018-11-14	3	-3/+13
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
\| * \| \| \| \| \| \| \|	Fix bug causing not all emails to show up in commit email selectbox	Douwe Maan	2018-11-14	3	-3/+13
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54045
* \| \| \| \| \| \| \|	Merge branch '53918-snippet-commit-comments' into 'master'	Fatih Acet	2018-11-14	2	-4/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
\| * \| \| \| \| \| \| \|	Fix styling of snippet and commit discussion comments53918-snippet-commit-comments	Annabel Dunstone Gray	2018-11-14	2	-4/+24
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'discussion-fixes-2' into 'master'	Fatih Acet	2018-11-14	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
\| * \| \| \| \| \| \|	Fix diff border radiusdiscussion-fixes-2	Annabel Dunstone Gray	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix vertical line alignment in discussion	Annabel Dunstone Gray	2018-11-14	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dark-theme-comments' into 'master'	Fatih Acet	2018-11-14	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add white background to commit diff comments See merge request gitlab-org/gitlab-ce!23078
\| * \| \| \| \| \| \| \|	Add white background to commit diff comments	Annabel Dunstone Gray	2018-11-14	1	-0/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'qa-fix-git-protocol-v2-spec' into 'master'	Rémy Coutable	2018-11-14	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Git protocol v2 e2e test Closes gitlab-org/quality/staging#16 See merge request gitlab-org/gitlab-ce!23067
\| * \| \| \| \| \| \| \|	Fix Git protocol v2 e2e testqa-fix-git-protocol-v2-spec	Mark Lapierre	2018-11-14	1	-2/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove references to `Factory`