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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bpj-repo-editor-fixes' into 'master'test-trigger-build	Jacob Schatz	2017-08-15	19	-114/+141
\|\ \| \| \| \| \| \| \| \|	Repo Editor Fixes See merge request !13468
\| *	Repo Editor Fixes	Bryce Johnson	2017-08-15	19	-114/+141
\|/
*	Merge branch 'docs-topic-permissions' into 'master'	Achilleas Pipinellis	2017-08-15	1	-19/+90
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: New index for permissions Closes #32577 See merge request !13394
\| *	Docs: New index for permissions	Marcia Ramos	2017-08-15	1	-19/+90
\|/
*	Merge branch 'changes-dropdown-unclickable' into 'master'	Clement Ho	2017-08-15	3	-3/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixed changed files dropdown not being shown Closes #36479 See merge request !13554
\| *	Fixed changed files dropdown not being shown	Phil Hughes	2017-08-15	3	-3/+7
\| \| \| \| \| \| \| \|	Closes #36479
* \|	Merge branch 'issue_31790' into 'master'	Douwe Maan	2017-08-15	3	-0/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API responses when dealing with txt files Closes #31790 See merge request !13474
\| * \|	Fix API responses when dealing with txt filesissue_31790	Felipe Artur	2017-08-15	3	-0/+17
\| \| \|
* \| \|	Merge branch 'workhorse-deprecate-gitaly-address' into 'master'	Douwe Maan	2017-08-15	2	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated field from workhorse API responses See merge request !13567
\| * \| \|	Remove deprecated field from workhorse API responsesworkhorse-deprecate-gitaly-address	Jacob Vosmaer	2017-08-15	2	-2/+0
\| \| \| \|
* \| \| \|	Merge branch 'fix-btn-alignment' into 'master'	Phil Hughes	2017-08-15	3	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inconsistent spacing for edit buttons on issues and merge request page Closes #36206 See merge request !13547
\| * \ \ \	Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment	Clement Ho	2017-08-15	186	-933/+1779
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \|	# Conflicts: # app/views/projects/merge_requests/_nav_btns.html.haml
\| * \| \| \|	Add changelog	Clement Ho	2017-08-14	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Fix inconsistent spacing for edit buttons on issues and merge request page	Clement Ho	2017-08-14	2	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'	Jacob Schatz	2017-08-15	3	-4/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Enable scope hoisting with webpack" Closes #36152 See merge request !13374
\| * \| \| \| \|	update webpack to v3.5.436152-enable-scope-hoisting-with-webpack	Mike Greiling	2017-08-15	2	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	enable webpack scope hoisting	Mike Greiling	2017-08-15	3	-4/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-any-projects-array' into 'master'	Douwe Maan	2017-08-15	2	-3/+11
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow usage of any_projects? with an Array Closes #3646 See merge request !13559
\| * \| \| \| \|	Allow usage of any_projects? with an Arrayfix-any-projects-array	Yorick Peterse	2017-08-15	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In some cases we pass an Array to this method which would previously fail since Array does not respond to "limit_value". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
* \| \| \| \| \|	Merge branch '36450_confi_polish' into 'master'	Clement Ho	2017-08-15	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Confidential Message When Visible - UI Polish See merge request !13551
\| * \| \| \| \| \|	change message and change spec36450_confi_polish	Regis	2017-08-14	2	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-add-two-more-project-templates' into 'master'	Douwe Maan	2017-08-15	7	-4/+13
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add two more project templates See merge request !13415
\| * \| \| \| \| \|	Add two more project templateszj-add-two-more-project-templates	Z.J. van de Weg	2017-08-15	7	-4/+13
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
* \| \| \| \| \|	Merge branch 'docs-jira' into 'master'	Douwe Maan	2017-08-15	2	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JIRA docs update See merge request !13514
\| * \| \| \| \| \|	Replace jira_service_page.pngdocs-jira	Victor Wu	2017-08-11	1	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	JIRA docs	Victor Wu	2017-08-11	1	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'malformed-submodule' into 'master'	Douwe Maan	2017-08-15	7	-4/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle missing .gitmodules when getting submodule urls See merge request !13509
\| * \| \| \| \| \| \|	Handle missing .gitmodules when getting submodule urlsmalformed-submodule	Jacob Vosmaer	2017-08-14	7	-4/+16
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'winh-gpg-status-spinners' into 'master'	Phil Hughes	2017-08-15	6	-2/+79
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display GPG status loading spinner only when Ajax request is made Closes #35699 See merge request !13526
\| * \| \| \| \| \| \|	Display GPG status loading spinner only when Ajax request is made	Winnie Hellmann	2017-08-15	6	-2/+79
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-broadcast-messages-migration' into 'master'	Douwe Maan	2017-08-15	1	-1/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove invalid broadcast messages before migrating See merge request !13538
\| * \| \| \| \| \| \|	Remove invalid broadcast messages before migratingfix-broadcast-messages-migration	Yorick Peterse	2017-08-14	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents the migration from failing to set "NOT NULL" constraints when some rows contain NULL values that are no longer allowed.
* \| \| \| \| \| \| \|	Merge branch 'forks-count-cache' into 'master'	Douwe Maan	2017-08-15	14	-1/+141
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache the number of forks of a project See merge request !13535
\| * \| \| \| \| \| \| \|	Cache the number of forks of a projectforks-count-cache	Yorick Peterse	2017-08-14	14	-1/+141
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The number of forks of a project doesn't change very frequently and running a COUNT() every time this information is requested can be quite expensive. We also end up running such a COUNT() query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* \| \| \| \| \| \| \| \|	Merge branch '36398-update-our-auto-deploy-docs-to-include-monitoring-docs' ↵	Achilleas Pipinellis	2017-08-15	3	-1/+26
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add auto-monitoring docs to auto-deploy page Closes #36398 See merge request !13522
\| * \| \| \| \| \| \| \| \|	Add auto-monitoring docs to auto-deploy page	Joshua Lambert	2017-08-15	3	-1/+26
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-edit-merge-request-button-case' into 'master'	Phil Hughes	2017-08-15	6	-13/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix edit merge request button inconsistent letter casing Closes #34086 See merge request !13548
\| * \| \| \| \| \| \| \| \|	Fix edit merge request button inconsistent letter casing	Clement Ho	2017-08-15	6	-13/+18
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '34533-speed-up-group-project-authorizations' into 'master'	Douwe Maan	2017-08-15	6	-10/+88
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
\| * \| \| \| \| \| \| \| \|	Speed up Group#user_ids_for_project_authorizations	Nick Thomas	2017-08-14	6	-10/+88
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '34371-pipeline-schedule-vue-files' into 'master'	Phil Hughes	2017-08-15	5	-52/+67
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move callout to vue file and remove svg from data function to improve performance See merge request !13539
\| * \| \| \| \| \| \| \| \|	Adds line to the end of the file34371-pipeline-schedule-vue-files	Filipa Lacerda	2017-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move callout to vue file and remove svg from data function to improve ↵	Filipa Lacerda	2017-08-14	5	-52/+67
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	performance
* \| \| \| \| \| \| \| \|	Merge branch 'docs-correct-filetree' into 'master'	Achilleas Pipinellis	2017-08-15	28	-213/+187
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs correct filetree Closes #36428 See merge request !13545
\| * \| \| \| \| \| \| \| \|	update remaining links for add-user.mddocs-correct-filetree	Marcia Ramos	2017-08-14	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add file finder to repo index	Marcia Ramos	2017-08-14	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	delete duplicate content	Marcia Ramos	2017-08-14	3	-47/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delete old doc, update links to the current doc
\| * \| \| \| \| \| \| \| \|	move "share projects with groups" docs	Marcia Ramos	2017-08-14	9	-49/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- correct the file tree - remove duplicate doc - move to project/members/ - move images - update links
\| * \| \| \| \| \| \| \| \|	link file moved to members/index from project's index	Marcia Ramos	2017-08-14	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	move doc from /workflow/ to /project/	Marcia Ramos	2017-08-14	15	-114/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix the file tree