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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix MergeRequest#commits_count nil comparisonfj-59547-fix-has-commits	Francisco Javier López	2019-04-01	2	-4/+11
\|
*	Merge branch 'patch-30' into 'master'	Evan Read	2019-03-29	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	README.md: fix URL to CI Lint See merge request gitlab-org/gitlab-ce!26580
\| *	README.md: fix URL to CI Lint	Damian Nowak	2019-03-26	1	-1/+1
\| \|
* \|	Merge branch 'docs-ci-intro-illustration' into 'master'	Mike Lewis	2019-03-29	3	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update CI/CD intro - workflow illustration Closes #59108 See merge request gitlab-org/gitlab-ce!26733
\| * \|	Update ci workflow illustration	Marcia Ramos	2019-03-28	3	-1/+1
\| \| \|
* \| \|	Merge branch '9420-truncate-long-tags' into 'master'	Mike Greiling	2019-03-28	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate long tags in runners table See merge request gitlab-org/gitlab-ce!26666
\| * \| \|	Truncate long tags in runners table	Sarah Groff Hennigh-Palermo	2019-03-28	1	-1/+1
\|/ / /
* \| \|	Merge branch 'ce-reduce-diff-with-ce-in-spec-helpers' into 'master'	Lin Jen-Shin	2019-03-28	6	-7/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Reduce diff with EE in `spec/helpers` Closes gitlab-ee#10143 See merge request gitlab-org/gitlab-ce!26706
\| * \| \|	[CE] Reduce the diff with EE in spec/helpers/projects_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	[CE] Reduce the diff with EE in spec/helpers/merge_requests_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	[CE] Reduce the diff with EE in spec/helpers/issuables_helper_spec.rb	Rémy Coutable	2019-03-28	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	[CE] Reduce the diff with EE in spec/helpers/group_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	[CE] Reduce the diff with EE in spec/helpers/auth_helper_spec.rb	Rémy Coutable	2019-03-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	[CE] Reduce the diff with EE in spec/helpers/appearances_helper_spec.rb	Rémy Coutable	2019-03-28	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'related-mr-link-cutoff' into 'master'docs-ci-variables-move-9-0-renaming	Annabel Dunstone Gray	2019-03-28	2	-0/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Don't cutoff letters in MR and Issue links See merge request gitlab-org/gitlab-ce!25910
\| * \| \|	Don't cutoff letters in MR and Issue links	gfyoung	2019-03-28	2	-0/+6
\|/ / /
* \| \|	Merge branch 'renovate/gitlab-svgs-1.x' into 'master'	Mike Greiling	2019-03-28	2	-5/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Update dependency @gitlab/svgs to ^1.55.0 See merge request gitlab-org/gitlab-ce!26664
\| * \|	Merge branch 'master' into 'renovate/gitlab-svgs-1.x'	Lukas 'Eipi' Eipert	2019-03-28	2	-5/+5
\|/ / \| \| \| \| \| \| \| \|	# Conflicts: # package.json
* \|	Merge branch '24936-remove-type-from-review-app-name' into 'master'	Mike Greiling	2019-03-28	2	-10/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant group name from environment name on the "Environments" page Closes #24936 See merge request gitlab-org/gitlab-ce!25600
\| * \|	Remove folder from environment name	Nathan Friend	2019-03-18	2	-10/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this commit, environments grouped together in a "folder" would include the folder name in the UI. This information was unnecessary since the folder is also shown in the UI. In addition, this commit also makes some minor changes to how tooltips are displayed for both environments and folders.
* \| \|	Merge branch 'standardize-click-and-go-to' into 'master'	Rémy Coutable	2019-03-28	55	-90/+84
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Standardize usage of `click_` and `go_to` on GUI tests See merge request gitlab-org/gitlab-ce!26328
\| * \| \|	Standardize usage of `click_` and `go_to` on GUI tests	Walmyr	2019-03-28	55	-90/+84
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR addresses the following issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/57043 Based on the following comment: https://gitlab.com/gitlab-org/gitlab-ce/issues/57043#note_136663994
* \| \|	Merge branch 'id-get-blobs-performance' into 'master'	Douwe Maan	2019-03-28	1	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Memoize old_blob and new_blob to improve performance See merge request gitlab-org/gitlab-ce!26604
\| * \| \|	Memoize old_blob and new_blob to improve performance	Igor	2019-03-28	1	-2/+6
\|/ / /
* \| \|	Merge branch 'docs-document-qa-specific-branch-naming' into 'master'	Rémy Coutable	2019-03-28	1	-0/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the branch naming conventions for QA-only changes See merge request gitlab-org/gitlab-ce!26704
\| * \| \|	Document the branch naming conventions for QA-only changes	Rémy Coutable	2019-03-28	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'remove-cng-job' into 'master'	Robert Speicher	2019-03-28	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove cloud-native-job from CI See merge request gitlab-org/gitlab-ce!25605
\| * \| \| \|	Make cloud release job manual, as a fallback	Balasankar "Balu" C	2019-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* \| \| \| \|	Merge branch 'knative-update' into 'master'	Grzegorz Bizon	2019-03-28	3	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Knative version bump 0.2.2 -> 0.3.0 See merge request gitlab-org/gitlab-ce!26459
\| * \| \| \| \|	Knative version bump 0.2.2 -> 0.3.0	Chris Baumbauer	2019-03-28	3	-3/+8
\|/ / / / /
* \| \| \| \|	Merge branch ↵	Phil Hughes	2019-03-28	3	-13/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master' Remove EE differences for monitoring dashboard See merge request gitlab-org/gitlab-ce!26574
\| * \| \| \| \|	Remove EE differences for monitoring dashboard	Simon Knox	2019-03-27	3	-13/+62
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '59079-fix-jupyter-render-loop' into 'master'	Phil Hughes	2019-03-28	2	-14/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix jupyter rendering bug that ended in an infinite loop Closes #59079 See merge request gitlab-org/gitlab-ce!26667
\| * \| \| \| \| \|	Fix jupyter rendering bug that ended in an infinite loop	ROSPARS Benoit	2019-03-27	2	-14/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '10518-boards-css' into 'master'	Phil Hughes	2019-03-28	1	-1/+16
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for boards.scss Closes gitlab-ee#10518 See merge request gitlab-org/gitlab-ce!26647
\| * \| \| \| \| \|	Removes EE differences for boards.scss	Filipa Lacerda	2019-03-27	1	-1/+16
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'docs/review-MR-25586' into 'master'	Achilleas Pipinellis	2019-03-28	2	-19/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs review for MR 25586 Closes #59262 See merge request gitlab-org/gitlab-ce!26632
\| * \| \| \| \| \|	Docs review for MR 25586	Evan Read	2019-03-28	2	-19/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'zm-test-plan-refs' into 'master'	Achilleas Pipinellis	2019-03-28	2	-1/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update testing guide to reference test design See merge request gitlab-org/gitlab-ce!26619
\| * \| \| \| \| \|	Update testing guide to reference test design	Zeff Morgan	2019-03-26	2	-1/+16
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '54670-external-diffs-when-outdated' into 'master'	Sean McGivern	2019-03-28	17	-24/+563
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow external diffs to be used conditionally Closes #54670 See merge request gitlab-org/gitlab-ce!25432
\| * \| \| \| \| \| \|	Allow external diffs to be used conditionally	Nick Thomas	2019-03-27	17	-24/+563
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since external diffs are likely to be a bit slower than in-database ones, add a mode that makes diffs external after they've been obsoleted by events. This should strike a balance between performance and disk space. A background cron drives the majority of migrations, since diffs become outdated through user actions.
* \| \| \| \| \| \| \|	Merge branch '59273-update-fugit' into 'master'	Grzegorz Bizon	2019-03-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update fugit which fixes a potential infinite loop Closes #59273 See merge request gitlab-org/gitlab-ce!26579
\| * \| \| \| \| \| \| \|	Update fugit which fixes a potential infinite loop	Lin Jen-Shin	2019-03-26	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '59062-update-gitlab-markup-python-3' into 'master'	Sean McGivern	2019-03-28	7	-3/+130
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-markup to 1.7.0 and document Python3 requirements Closes #59062 See merge request gitlab-org/gitlab-ce!26246
\| * \| \| \| \| \| \| \| \|	Upgrade `gitlab-markup` to 1.7.0	Gabriel Mazetto	2019-03-27	7	-3/+130
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new version requires `python3` to be available. In omnibus installation this is already a reality as we are currently pathing previous `gitlab-markup` version to use `python3` instead of `python2`. We are now requiring `python3` with the gem without having to patch it. As a consequence to also make it easy to use it in development, we've introduced a `Pipfile` and `Pipfile.lock`, working similarly to `Gemfile` and `Gemfile.lock`, and added documentation on how to use them.
* \| \| \| \| \| \| \| \|	Merge branch 'fix-routes-n-plus-one-in-user-autocomplete' into 'master'	Grzegorz Bizon	2019-03-28	5	-18/+84
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 queries from users autocomplete See merge request gitlab-org/gitlab-ce!26491
\| * \| \| \| \| \| \| \| \|	Remove N+1 queries from users autocomplete	Sean McGivern	2019-03-25	5	-18/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Both of these were related to groups: 1. We need to preload routes (using the `with_route` scope) if we're going to get the group's path. 2. We were counting each group's members separately. They're in the same commit because the spec for N+1 detection wouldn't pass with only one of these fixes.
* \| \| \| \| \| \| \| \| \|	Merge branch '59546-fix-error-handling-for-missing-domain' into 'master'	Sean McGivern	2019-03-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Auto DevOps missing domain error handling Closes #59546 See merge request gitlab-org/gitlab-ce!26627
\| * \| \| \| \| \| \| \| \| \|	Fix Auto DevOps missing domain error handling	Dylan Griffith	2019-03-28	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For some reason this value can be an empty string and we want to ensure that we correctly fail the job before a deploy. This is particularly problematic at the moment when coupled with https://gitlab.com/gitlab-org/gitlab-ce/issues/54760 as the user has no easy way to recover without destroying the cluster and starting over.