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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes project denial of service via gitmodules using Extended ASCII.34259-project-denial-of-service-via-gitmodules-fix	Tiago Botelho	2017-09-15	3	-4/+19
\|
*	Merge branch '37729-fix-wiki-page-let' into 'master'	Rémy Coutable	2017-09-12	1	-12/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix a `wiki_page` factory instantiation for the case when project's namespace is a group Closes #37729 See merge request !14205
\| *	Use WikiPages::CreateService in ↵	Rémy Coutable	2017-09-12	1	-12/+2
\|/ \| \| \| \| \|	spec/features/projects/wiki/user_updates_wiki_page_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'replace_project_merge_requests_revert.feature' into 'master'	Rémy Coutable	2017-09-12	4	-85/+65
\|\ \| \| \| \| \| \| \| \|	Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog See merge request !14201
\| *	Replace the 'project/merge_requests/revert.feature' spinach test with an ↵	Vitaliy @blackst0ne Klachkov	2017-09-12	4	-85/+65
\| \| \| \| \| \| \| \|	rspec analog
* \|	Merge branch 'replace_milestone.feature' into 'master'	Rémy Coutable	2017-09-12	4	-78/+45
\|\ \ \| \|/ \|/\| \| \| \| \|	Replace the 'project/milestone.feature' spinach test with an rspec analog See merge request !14171
\| *	Replace the project/milestone.feature spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-12	4	-78/+45
\| \|
* \|	Merge branch 'jk-update-install-guide' into 'master'	Robert Speicher	2017-09-11	8	-8/+364
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation and update instructions for 10.0 [ci skip] See merge request !14135
\| * \|	update installation and update instructions for 10.0jk-update-install-guide	Jarka Kadlecova	2017-09-11	8	-8/+364
\| \| \|
* \| \|	Merge branch 'docs-group-mrs-list-view-search-bar' into 'master'	Clement Ho	2017-09-11	2	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs group mrs list view search bar See merge request !14196
\| * \| \|	Docs group mrs list view search bar	Victor Wu	2017-09-11	2	-2/+0
\|/ / /
* \| \|	Merge branch '37608-reset-all-connections' into 'master'	Robert Speicher	2017-09-11	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset all connection schema cache after migration tests See merge request !14195
\| * \| \|	Reset all connection schema cache after migration tests37608-reset-all-connections	Lin Jen-Shin	2017-09-12	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We might also want to consider reduce the number of connections in the tests. However I just tried setting it to 1 and that doesn't seem enough for feature tests.
* \| \| \|	Merge branch 'consistent-tooltip-direction-on-commits' into 'master'	Clement Ho	2017-09-11	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make all the tooltips in the same direction on the commit info box See merge request !14128
\| * \| \| \|	Make all the tooltips in the same direction on the commit info box	Jedidiah	2017-09-11	2	-1/+6
\|/ / / /
* \| \| \|	Merge branch 'replace_project_merge_requests_accept.feature' into 'master'	Rémy Coutable	2017-09-11	4	-83/+70
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog See merge request !14176
\| * \| \|	Replace the 'project/merge_requests/accept.feature' spinach test with an ↵	blackst0ne	2017-09-11	4	-83/+70
\| \|/ / \| \| \| \| \| \| \| \| \|	rspec analog
* \| \|	Merge branch 'replace_spinach_wiki.feature' into 'master'	Rémy Coutable	2017-09-11	8	-470/+413
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856
\| * \| \|	Replace 'project/wiki.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-11	8	-470/+413
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'docs/gitaly-patch-update' into 'master'	Rémy Coutable	2017-09-11	1	-3/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add gitaly to patch update doc Closes gitlab-ee#3389 See merge request !14184
\| * \| \|	Add gitaly to patch update doc	Achilleas Pipinellis	2017-09-11	1	-3/+11
\| \|/ /
* \| \|	Merge branch 'italicized_emoji' into 'master'	Annabel Dunstone Gray	2017-09-11	2	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji was rendered as italic Closes #31676 See merge request !13974
\| * \| \|	Emoji was rendered as italic	Branka Martinovic	2017-09-11	2	-0/+6
\|/ / /
* \| \|	Merge branch 'replace_group_links.feature' into 'master'	Rémy Coutable	2017-09-11	4	-67/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'project/group_links.feature' spinach test with an rspec analog See merge request !14169
\| * \| \|	Replace project/group_links.feature spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-10	4	-67/+46
\| \|/ /
* \| \|	Merge branch 'docs/document-swapping-tables' into 'master'	Rémy Coutable	2017-09-11	2	-0/+54
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how to swap database tables. See merge request !14183
\| * \| \|	Document how to swap database tables.docs/document-swapping-tables	Yorick Peterse	2017-09-11	2	-0/+54
\| \| \| \|
* \| \| \|	Merge branch 'ie-event-polyfill' into 'master'	Phil Hughes	2017-09-11	4	-1/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds Event polyfill for IE Closes #37633 See merge request !14159
\| * \| \| \|	Adds Event polyfill for IE	Filipa Lacerda	2017-09-11	4	-1/+30
\|/ / / /
* \| \| \|	Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' ↵	Kamil Trzciński	2017-09-11	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Backport the EE signature of Gitlab::Workhorse#send_artifacts_entry See merge request !14144
\| * \| \| \|	Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-ee	Rémy Coutable	2017-09-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'sh-filter-runner-token' into 'master'	Robert Speicher	2017-09-11	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand filtered parameters to include `token` See merge request !14174
\| * \| \| \| \|	Expand filtered parameters to include `token`sh-filter-runner-token	Stan Hu	2017-09-10	1	-2/+2
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly.
* \| \| \| \|	Merge branch '37647-follow-up-from-update-helm-chart-docs-from-ce-docs' into ↵	Achilleas Pipinellis	2017-09-11	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve Follow-up from Update Helm Chart docs from CE - docs Closes #37647 See merge request !14166
\| * \| \| \| \|	Fix links37647-follow-up-from-update-helm-chart-docs-from-ce-docs	Joshua Lambert	2017-09-08	2	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Fix links	Joshua Lambert	2017-09-08	3	-9/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Make links relative	Joshua Lambert	2017-09-08	4	-14/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'replace_emails.feature' into 'master'	Rémy Coutable	2017-09-11	4	-74/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'profile/emails.feature' spinach test with an rspec analog See merge request !14172
\| * \| \| \| \| \|	Replace the profile/emails.feature spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-10	4	-74/+83
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'replace_team_management.feature' into 'master'	Rémy Coutable	2017-09-11	4	-113/+73
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/team_management.feature' spinach test with an rspec analog See merge request !14173
\| * \| \| \| \| \|	Replace the project/team_management.feature spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-10	4	-113/+73
\| \|/ / / / /
* \| \| \| \| \|	Merge branch ↵	Tim Zallmann	2017-09-11	5	-18/+60
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37644-update-prometheus-metric-library-to-support-multiple-series-and-colors' into 'master' Update Prometheus Metric Library to support multiple series and colors Closes #37644 See merge request !14155
\| * \| \| \| \| \|	update ingress doc37644-update-prometheus-metric-library-to-support-multiple-series-and-colors	Joshua Lambert	2017-09-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix ingress query	Joshua Lambert	2017-09-09	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update k8s metrics and docs	Joshua Lambert	2017-09-08	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update queries for colors and series	Joshua Lambert	2017-09-08	5	-18/+59
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'import-sources-fix' into 'master'	Rémy Coutable	2017-09-11	3	-2/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Read import sources from setting at first initialization See merge request !14141
\| * \| \| \| \| \| \|	Read import sources from setting at first initialization	Visay Keo	2017-09-09	3	-2/+7
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'changes-tab-jumping' into 'master'	Filipa Lacerda	2017-09-11	2	-1/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed changes bar jumping on merge requests Closes #37589 See merge request !14157
\| * \| \| \| \| \|	Fixed changes bar jumping on merge requestschanges-tab-jumping	Phil Hughes	2017-09-08	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37589