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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Don't fail the job if the Review App doesn't deploy properlyqa-fix-review-app-ping	Rémy Coutable	2019-04-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	It seems the deploy function causes the job to fail if it doesn't succeed. That wasn't the intent as we want to curl the Review App after the deploy finished (even if it failed) because sometimes the Review App is just a bit long to be ready. This change wraps the Review App deployment with "set +e"/"set -e" to ensure that the job doesn't fail right away if the deploy fails. Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'filipa-master-patch-09545' into 'master'	Phil Hughes	2019-04-17	1	-31/+11
\|\ \| \| \| \| \| \| \| \|	Removes ifEE example for JS code. See merge request gitlab-org/gitlab-ce!27408
\| *	Removes ifEE example for JS codefilipa-master-patch-09545	Filipa Lacerda	2019-04-16	1	-31/+11
\| \|
* \|	Merge branch '59275-cluster-form-hints' into 'master'	Phil Hughes	2019-04-17	4	-15/+39
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add help texts to K8 form fields Closes #59275 See merge request gitlab-org/gitlab-ce!27274
\| * \|	Add help texts to K8 form fields	Enrique Alcántara	2019-04-17	4	-15/+39
\|/ /
* \|	Merge branch 'fix-logic-in-43263-git-push-option-to-create-mr-test' into ↵11-11-auto-deploy-0012345	Lin Jen-Shin	2019-04-17	1	-4/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix logic in Api::Internal test See merge request gitlab-org/gitlab-ce!27193
\| * \|	Fix logic in Api::Internal testfix-logic-in-43263-git-push-option-to-create-mr-test	Luke Duncalfe	2019-04-17	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The intention of this test is to ensure that the service class MergeRequests::PushOptionsHandlerService does not run when the :mr_push_options feature flag is disabled. This test was passing, however was not testing what it was supposed to be! For one, setting Feature.disable(:feature) in the test does not disable the feature, as rspec config in spec_helper stubs Feature to make all features enabled: https://gitlab.com/gitlab-org/gitlab-ce/commit/3ee48e422defaedd69946c607bd8d3672e510375 So the feature was still enabled in the test. But this test wasn't failing because unfortunately I had put: ``` expect(MergeRequests::PushOptionsHandlerService).to receive(:new) ``` instead of not_to! This meant that the `.new` method was being stubbed, so the service class did not create a MergeRequest, which satisfied the second expectation. ``` expect(MergeRequests::PushOptionsHandlerService).to receive(:new) ```
* \| \|	Merge branch 'tortuetorche/gitlab-ce-patch-auto-deploy-extra-values' into ↵	Grzegorz Bizon	2019-04-17	3	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow extra args for helm in Auto-DevOps See merge request gitlab-org/gitlab-ce!26838
\| * \| \|	Rename HELM_EXTRA_ARGS to differentiate between helm invocationstortuetorche/gitlab-ce-patch-auto-deploy-extra-values	James Fargher	2019-04-17	2	-4/+4
\| \| \| \|
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	James Fargher	2019-04-11	1	-1/+1
\| \| \| \|
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	James Fargher	2019-04-10	1	-1/+1
\| \| \| \|
\| * \| \|	Add HELM_EXTRA_ARGS to all Auto-DevOps helm invocations	James Fargher	2019-04-08	3	-0/+7
\| \| \| \|
\| * \| \|	Allows extra arguments in helm commands for auto-deploying application	Tortue Torche	2019-04-08	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'fix-sidebar-spec-master' into 'master'	Michael Kozono	2019-04-17	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Fix no assignee text in sidebar_spec See merge request gitlab-org/gitlab-ce!27444
\| * \| \| \|	Fix no assignee text in sidebar_specfix-sidebar-spec-master	Luke Bennett	2019-04-17	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch '58361-issue-create-system-note-timestamp' into 'master'	Stan Hu	2019-04-16	4	-2/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set correct timestamps when creating past issues Closes #58361 See merge request gitlab-org/gitlab-ce!27406
\| * \| \| \|	Set correct timestamps when creating past issues58361-issue-create-system-note-timestamp	Heinrich Lee Yu	2019-04-16	4	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sets `system_note_timestamp` from `created_at`
* \| \| \| \|	Merge branch 'none-for-assignees' into 'master'	Annabel Dunstone Gray	2019-04-16	4	-13/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`None` for assignees Closes #60599 See merge request gitlab-org/gitlab-ce!27419
\| * \| \| \| \|	`None` for assignees	Victor Wu	2019-04-16	4	-13/+13
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update assignees_spec.js Update sidebar_spec.rb Update issues_spec.rb
* \| \| \| \|	Merge branch 'zj-git-2.21-tests' into 'master'	Douglas Barbosa Alexandre	2019-04-16	6	-9/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test using Git 2.21 See merge request gitlab-org/gitlab-ce!27418
\| * \| \| \| \|	Update preflight check to require 2.21zj-git-2.21-tests	Zeger-Jan van de Weg	2019-04-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Update source install docs for Git 2.21	Zeger-Jan van de Weg	2019-04-16	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Test using Git 2.21	Zeger-Jan van de Weg	2019-04-16	4	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given Rails doesn't use the Git binary anymore, this shouldn't be a problem.
* \| \| \| \| \|	Merge branch '60605-karma-failing' into 'master'	Michael Kozono	2019-04-16	1	-18/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Karma failing with MrWidgetAlertMessage when helpPath is provided Maximum call stack size exceeded" Closes #60605 See merge request gitlab-org/gitlab-ce!27429
\| * \| \| \| \| \|	Add sync: false to fix Karma tests60605-karma-failing	Nathan Friend	2019-04-16	1	-18/+32
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-cicd-workflow-illustration' into 'master'	Achilleas Pipinellis	2019-04-16	2	-16/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: CI/CD intro - add new illustration + description See merge request gitlab-org/gitlab-ce!27278
\| * \| \| \| \| \|	Docs: CI/CD intro - add new illustration + description	Marcia Ramos	2019-04-16	2	-16/+45
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'resource-label-events-api-link' into 'master'	Achilleas Pipinellis	2019-04-16	2	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to resource label events API See merge request gitlab-org/gitlab-ce!27412
\| * \| \| \| \| \|	Link to resource label events API	Victor Wu	2019-04-16	2	-0/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'winh-frontend-faq-docs' into 'master'	Marcia Ramos	2019-04-16	2	-0/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create frontend FAQ (documentation) See merge request gitlab-org/gitlab-ce!26372
\| * \| \| \| \| \|	Create frontend FAQ (documentation)	Winnie Hellmann	2019-04-16	2	-0/+31
\|/ / / / / /
* \| \| \| \| \|	Merge branch '59034-external-link-button' into 'master'	Tim Zallmann	2019-04-16	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced "View file" button with doc-text icon Closes #59034 See merge request gitlab-org/gitlab-ce!27365
\| * \| \| \| \| \|	Replaced external link button with doc-text icon59034-external-link-button	Denys Mishunov	2019-04-15	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59034
* \| \| \| \| \| \|	Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' ↵	Filipa Lacerda	2019-04-16	13	-5/+270
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update merge request widget to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25983
\| * \| \| \| \| \| \|	Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelines	Nathan Friend	2019-04-15	13	-5/+270
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds two new warning messages to the MR widget that handle cases involving merge request pipelines.
* \| \| \| \| \| \| \|	Merge branch 'docs-fix-ldap-typo' into 'master'	Rémy Coutable	2019-04-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix minor typo in LDAP docs Closes #60413 See merge request gitlab-org/gitlab-ce!27415
\| * \| \| \| \| \| \| \|	Fix minor typo in LDAP docsdocs-fix-ldap-typo	Mark Fletcher	2019-04-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'gt-fix-styling-for-pages-status' into 'master'	Filipa Lacerda	2019-04-16	16	-24/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling for `app/assets/stylesheets/pages/status.scss` Closes #59929 See merge request gitlab-org/gitlab-ce!26875
\| * \| \| \| \| \| \| \| \|	Rename CI related selectors	George Tsiolis	2019-04-16	16	-24/+24
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '48431-width' into 'master'	Kushal Pandya	2019-04-16	3	-1/+24
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide overflow in scoped labels Closes #48431 See merge request gitlab-org/gitlab-ce!27362
\| * \| \| \| \| \| \| \|	Hide overflow in scoped labels	Rajat Jain	2019-04-16	3	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scoped labels overflew in all the places because of lack of restriction on `max-width`. This commit introduces the same limits on width we have inplace for regular labels
* \| \| \| \| \| \| \| \|	Merge branch 'mc/feature/custom-metrics-ce' into 'master'	Kamil Trzciński	2019-04-16	9	-28/+58
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport metrics report type See merge request gitlab-org/gitlab-ce!26798
\| * \| \| \| \| \| \| \| \|	Backport changes from EE	Matija Čupić	2019-04-16	9	-28/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-migration-docs' into 'master'	Marcia Ramos	2019-04-16	1	-3/+23
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update migration docs See merge request gitlab-org/gitlab-ce!27261
\| * \| \| \| \| \| \| \| \| \|	Update migration docs	Michael Leopard	2019-04-16	1	-3/+23
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-38' into 'master'	Marcia Ramos	2019-04-16	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Complete "Repository storage" directions See merge request gitlab-org/gitlab-ce!27346
\| * \| \| \| \| \| \| \| \| \|	Complete "Repository storage" directions	Katrin Leinweber	2019-04-13	1	-2/+2
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '60533-tooltip-for-view-file-shows-raw-html' into 'master'	Kushal Pandya	2019-04-16	2	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Tooltip for "View file" shows raw HTML" Closes #60533 See merge request gitlab-org/gitlab-ce!27398
\| * \| \| \| \| \| \| \| \| \|	Fix showing HTML content in view file tooltip60533-tooltip-for-view-file-shows-raw-html	Fatih Acet	2019-04-16	2	-3/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '59570-move-quick-action' into 'master'	Sean McGivern	2019-04-16	3	-120/+92
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract move quick action spec to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26907