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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix API responses when dealing with txt filesissue_31790	Felipe Artur	2017-08-15	3	-0/+17
\|
*	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
* \| \| \| \| \| \| \|	Merge branch 'update-vue-docs' into 'master'	Stan Hu	2017-08-15	1	-0/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs with Javascript accord. See merge request !13440
\| * \| \| \| \| \| \|	Update docs with Javascript accord.	Jacob Schatz	2017-08-15	1	-0/+17
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'repo-fixes-e' into 'master'	Jacob Schatz	2017-08-14	15	-116/+149
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repo fixes part E See merge request !13472
\| * \| \| \| \| \| \|	Add shared getFileExtension helper methodrepo-fixes-e	Eric Eastwood	2017-08-14	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146854
\| * \| \| \| \| \| \|	Remove unused repo store keys	Eric Eastwood	2017-08-14	2	-17/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37147332
\| * \| \| \| \| \| \|	Add comment about why we need to stop parsing JSON	Eric Eastwood	2017-08-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146815 See https://gitlab.slack.com/archives/C0GQHHPGW/p1501779964878178
\| * \| \| \| \| \| \|	Use single js- wrapper class to show/hide	Eric Eastwood	2017-08-14	4	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37146360
\| * \| \| \| \| \| \|	Scroll total scroll width instead of fixed value	Eric Eastwood	2017-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed value could potentially be not enough Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145886
\| * \| \| \| \| \| \|	Switch single fa icon generation to inline	Eric Eastwood	2017-08-14	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145729
\| * \| \| \| \| \| \|	Remove duplicate setting of variable	Eric Eastwood	2017-08-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37145640
\| * \| \| \| \| \| \|	Reset monacoLoading on failure	Eric Eastwood	2017-08-14	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
\| * \| \| \| \| \| \|	Remove overflow tabs logic (no longer used)	Eric Eastwood	2017-08-14	3	-26/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143794
\| * \| \| \| \| \| \|	Remove loading state from repo_tab	Eric Eastwood	2017-08-14	2	-23/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143710
\| * \| \| \| \| \| \|	Make close/changed icon more accessible	Eric Eastwood	2017-08-14	1	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143527
\| * \| \| \| \| \| \|	Use promise syntax with Helper.getContent	Eric Eastwood	2017-08-14	3	-12/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143217
\| * \| \| \| \| \| \|	Split out linkClicked and add tests	Eric Eastwood	2017-08-14	2	-24/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37143174
\| * \| \| \| \| \| \|	Use v-else instead of duplicating logic	Eric Eastwood	2017-08-14	2	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix http://192.168.1.135:3000/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/broadcast_message.js
\| * \| \| \| \| \| \|	Move syntax highlighting into a method	Eric Eastwood	2017-08-10	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37142936