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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix a "Wrong number of arguments" error in TreeHelper#flatten_tree37569-fix-wrong-number-of-arguments-in-tree_helper-flatten_tree	Rémy Coutable	2017-09-07	2	-1/+21
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'events-migration-cleanup' into 'master'	Sean McGivern	2017-09-07	26	-327/+160
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Finish migration to the new events setup Closes #37241 See merge request !13932
\| *	Update project templates to new import version	Zeger-Jan van de Weg	2017-09-07	3	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the import version changes, we need to update a few project templates to match this new version. In a seperate commit I'll update the docs to reflect this.
\| *	Finish migration to the new events setupevents-migration-cleanup	Yorick Peterse	2017-09-06	23	-327/+160
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
* \|	Merge branch '37530-fix-skip-to-content-alignment' into 'master'	Tim Zallmann	2017-09-07	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment for Skip to content action Closes #37530 See merge request !14101
\| * \|	Use `flex` to center align content37530-fix-skip-to-content-alignment	kushalpandya	2017-09-07	1	-1/+2
\| \| \|
* \| \|	Merge branch 'dz-rebuild-schema' into 'master'	Yorick Peterse	2017-09-07	2	-24/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update schema.rb from db:migrate and fix invalid index check See merge request !14107
\| * \| \|	Update schema.rb from db:migrate and fix invalid index checkdz-rebuild-schema	Dmitriy Zaporozhets	2017-09-07	2	-24/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'feature/plantuml-restructured-text' into 'master'	Rémy Coutable	2017-09-07	2	-1/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for PlantUML in reStructuredText See merge request !13900
\| * \| \| \|	Add documentation for PlantUML in reStructuredText	Markus Koller	2017-08-29	2	-1/+15
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2017-09-07	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: fix json response See merge request !13831
\| * \| \| \| \|	fix json response	EmilienMottet	2017-08-29	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '34945-readme-div-id' into 'master'	Rémy Coutable	2017-09-07	3	-3/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#34945: add a div id to the readme section in the project overview Closes #34945 See merge request !13735
\| * \| \| \| \| \|	#34945: add a div id to the readme section in the project overview	Riccardo Padovani	2017-09-07	3	-3/+9
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'patch-15' into 'master'	Rémy Coutable	2017-09-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect reference in documentation See merge request !13733
\| * \| \| \| \| \|	Fix incorrect reference in documentation	Johan Brandhorst	2017-08-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2017-09-07	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example of docker login with personal access token See merge request !13668
\| * \| \| \| \| \| \|	Add example of docker login with personal access token	Tim Hobbs	2017-08-18	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-09-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor Text Fix See merge request !13946
\| * \| \| \| \| \| \| \|	Minor Text Fix	Sab94	2017-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '37349-remove-extra-top-margin-search-dropdown' into 'master'	Annabel Dunstone Gray	2017-09-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spacing between nav and dropdown to be consistent with other dropdowns Closes #37349 See merge request !14088
\| * \| \| \| \| \| \| \| \|	Fix spacing between nav and dropdown to be consistent with other dropdowns37349-remove-extra-top-margin-search-dropdown	kushalpandya	2017-09-06	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Rémy Coutable	2017-09-07	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CONTRIBUTING.md: fix CD label (it's CI/CD now) See merge request !14017
\| * \| \| \| \| \| \| \| \|	fix one more label not expanded issue	Elan Ruusamäe	2017-09-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	just remove the ~ in display text making it into real label link would confuse user as the label links to different filter
\| * \| \| \| \| \| \| \| \|	CONTRIBUTING.md: fix CD label (it's CI/CD now)	Elan Ruusamäe	2017-09-03	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ee_issue_928_backport' into 'master'	Sean McGivern	2017-09-07	78	-527/+774
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group boards CE backport See merge request !13883
\| * \| \| \| \| \| \| \| \| \|	Fix failing specee_issue_928_backport	Felipe Artur	2017-09-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Finish backports and fix specs	Felipe Artur	2017-09-06	3	-4/+14
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	api js changes not needed for CE	Simon Knox	2017-09-06	2	-31/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	pick some missing JS	Simon Knox	2017-09-06	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	backport boards specs	Simon Knox	2017-09-06	12	-67/+104
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	backport scss for group boards	Simon Knox	2017-09-06	2	-44/+21
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	missing js change	Simon Knox	2017-09-06	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	backport haml changes	Simon Knox	2017-09-06	9	-42/+50
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	move templates from projects to shared	Simon Knox	2017-09-06	12	-9/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	FE backport of group boards to reduce CE conflicts	Simon Knox	2017-09-06	12	-53/+116
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2017-09-06	1019	-9677/+33121
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ee_issue_928_backport
\| * \| \| \| \| \| \| \| \| \| \|	Fix route conflict	Felipe Artur	2017-09-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix specs BACKPORT	Felipe Artur	2017-09-04	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Small fixes	Felipe Artur	2017-08-31	5	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Backport specs	Felipe Artur	2017-08-31	5	-11/+34
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Continue BE backport	Felipe Artur	2017-08-31	16	-9/+55
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Group boards CE backport	Felipe Artur	2017-08-28	26	-280/+380
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-stray-or-in-project-create-ui' into 'master'	Rémy Coutable	2017-09-07	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix stray OR in New Project page See merge request !14096
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix stray OR in New Project page	Robin Bobbitt	2017-09-06	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When all import sources are disabled, the New Project page shows the "Create from template" options followed by an "OR" divider followed by nothing in 9.5.x.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fly-out-top-level-item' into 'master'	Filipa Lacerda	2017-09-07	15	-26/+271
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add top level items to fly-out navigation Closes #36294 See merge request !13981
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fixed spinach specsfly-out-top-level-item	Phil Hughes	2017-09-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2017-09-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add top level items to fly-out navigation	Phil Hughes	2017-09-06	15	-27/+272
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed. Closes #36294
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'breadcrumbs-extra-btns-remove' into 'master'	Filipa Lacerda	2017-09-07	25	-101/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves the action buttons out of the breadcrumbs Closes #36459 See merge request !14072