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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bring back Rugged implementation of ListCommitsByOidsh-backport-list-commits-by-oid-rugged	Stan Hu	2019-04-16	5	-5/+65
\| \| \| \| \| \| \| \| \| \| \| \| \|	This brings back changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20432. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged may be faster than going through than Gitaly. This merge request introduces the feature flag `rugged_list_commits_by_oid` to activate the Rugged method. For one customer, we saw that ListCommitsByOid was the second highest used endpoint that may be causing increased load.
*	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
\| * \| \| \| \| \| \| \| \|	Extract move quick action spec to shared example59570-move-quick-action	Alexandru Croitor	2019-04-15	3	-120/+92
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rewind-iid-on-pipelines' into 'master'	Sean McGivern	2019-04-16	7	-18/+188
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewind iid on pipelines Closes #59362 See merge request gitlab-org/gitlab-ce!26490
\| * \| \| \| \| \| \| \| \| \|	Rewind IID on Ci::Pipelinesrewind-iid-on-pipelines	Kamil Trzciński	2019-04-16	7	-18/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If no pipeline is created we currently have IID gap. This is due to fact that we generate IID not on save, but rather ahead of time. This results, us, losing IIDs.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '58748-update-nodejs-to-10.15.3' into 'master'	Kamil Trzciński	2019-04-16	2	-3/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Node.js to 10.15.3 in CI template for Hexo See merge request gitlab-org/gitlab-ce!25943
\| * \| \| \| \| \| \| \| \| \|	Update node.js to 10.15.3 in CI template for Hexo	Takuya Noguchi	2019-03-10	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mw-i18n-app-misc' into 'master'	Sean McGivern	2019-04-16	8	-15/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize several strings in controllers/services/presenters See merge request gitlab-org/gitlab-ce!27390
\| * \| \| \| \| \| \| \| \| \| \|	Externalize several strings in	Martin Wortschack	2019-04-16	8	-15/+48
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- app/services - app/controllers - app/presenters
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'downloading-expired-artifacts' into 'master'	Grzegorz Bizon	2019-04-16	4	-12/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't render artifact download links for builds with expired artifacts See merge request gitlab-org/gitlab-ce!26753
\| * \| \| \| \| \| \| \| \| \| \|	use cleaner expectation matchers from Capybara	drew cimino	2019-04-12	1	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't render artifact download links on the project tags page for builds ↵	drew cimino	2019-04-12	4	-12/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with expired artifacts
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '53138-add-metrics-usage-ping' into 'master'	Grzegorz Bizon	2019-04-16	3	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds instance metrics to usage ping Closes #53138 See merge request gitlab-org/gitlab-ce!27238
\| * \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Metrics methods for checking if metrics are enabled53138-add-metrics-usage-ping	Ryan Cobb	2019-04-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Adds changelog entry	Ryan Cobb	2019-04-10	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Adds instance metrics to usage ping	Ryan Cobb	2019-04-10	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds influxdb_metrics_enabled and prometheus_metrics_enabled to usage ping.