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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '23079-remove-default-scope-in-sortable' into 'master'	Douwe Maan	2017-09-07	2	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Removes default scope from sortable Closes #23079 See merge request !13558
\| *	Removes default scope from sortable23079-remove-default-scope-in-sortable	Tiago Botelho	2017-09-07	2	-3/+3
\| \|
* \|	Merge branch ↵	Sean McGivern	2017-09-07	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
\| * \|	Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-palette	Ruben Davila	2017-09-07	1	-1/+1
\| \| \|
\| * \|	Restore some changes from !9199	Rubén Dávila	2017-09-06	1	-0/+4
\| \| \|
* \| \|	Merge branch 'ee_issue_928_backport' into 'master'	Sean McGivern	2017-09-07	4	-15/+91
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group boards CE backport See merge request !13883
\| * \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2017-09-06	17	-94/+172
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \|	ee_issue_928_backport
\| * \| \|	Fix route conflict	Felipe Artur	2017-09-04	1	-2/+2
\| \| \| \|
\| * \| \|	Small fixes	Felipe Artur	2017-08-31	1	-1/+0
\| \| \| \|
\| * \| \|	Group boards CE backport	Felipe Artur	2017-08-28	4	-15/+92
\| \| \| \|
* \| \| \|	Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fix	Alejandro Rodríguez	2017-09-06	1	-1/+3
\| \|_\|/ \|/\| \|
* \| \|	Merge branch ↵	Douwe Maan	2017-09-06	1	-12/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
\| * \| \|	Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-list	Tiago Botelho	2017-09-06	1	-12/+18
\| \| \| \|
* \| \| \|	Merge branch '35161_first_time_contributor_badge' into 'master'	Sean McGivern	2017-09-06	2	-1/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First time contributor badge Closes #35161 See merge request !13902
\| * \| \| \|	fixup whitespace	micael.bergeron	2017-09-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	rework the contributor badge	micael.bergeron	2017-09-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- only show in merge-requests - show as a little glyph
\| * \| \| \|	WIP: refactor the first-contributor to Issuable	micael.bergeron	2017-09-06	2	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes
\| * \| \| \|	fix #35161, add a first-time contributor badge	micael.bergeron	2017-09-06	1	-0/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a new badge will be added when an user that doesn't yet have any merged merge request is discussing on either issues or merge requests that he created. this is indented for people to use extra care when discussing with a new contributor.
* \| \| \|	Merge branch '35441-fix-division-by-zero' into 'master'	Robert Speicher	2017-09-06	1	-6/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix division by zero for blame age map Closes #35441 See merge request !13803
\| * \| \| \|	Fix division by zero for blame age map	Jeff Stubler	2017-08-24	1	-6/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'generalize-profile-updates' into 'master'	Douwe Maan	2017-09-06	1	-4/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Profile updates from providers See merge request !12968
\| * \| \| \| \|	Profile updates from providers	Alexander Keramidas	2017-09-06	1	-4/+9
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'breadcrumbs-improvements' into 'master'	Filipa Lacerda	2017-09-06	6	-27/+53
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to breadcrumbs Closes #35269 and #36460 See merge request !13582
\| * \| \| \|	removed show_new_nav? referencesbreadcrumbs-improvements	Phil Hughes	2017-09-06	4	-47/+12
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into breadcrumbs-improvements	Phil Hughes	2017-09-06	5	-23/+10
\| \|\ \ \ \
\| * \| \| \| \|	fixed up JS to use a js-* class	Phil Hughes	2017-09-06	5	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed up Ruby based on review
\| * \| \| \| \|	Merge branch 'master' into breadcrumbs-improvements	Phil Hughes	2017-09-05	1	-1/+2
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into breadcrumbs-improvements	Phil Hughes	2017-09-05	1	-6/+0
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	fixed images changing height of breadcrumbs	Phil Hughes	2017-09-05	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into breadcrumbs-improvements	Phil Hughes	2017-09-05	2	-35/+0
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'master' into breadcrumbs-improvements	Phil Hughes	2017-09-04	14	-46/+156
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into breadcrumbs-improvements	Phil Hughes	2017-08-30	9	-17/+34
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	style updates	Phil Hughes	2017-08-18	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed some more breadcrumb titles
\| * \| \| \| \| \| \| \| \|	fix some inconsistencies with the breadcrumbs	Phil Hughes	2017-08-18	3	-7/+16
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	added collapsible sub-groups & wiki pages	Phil Hughes	2017-08-18	4	-7/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	updated a bunch of breadcrumb titles	Phil Hughes	2017-08-18	4	-9/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Improvements to breadcrumbs	Phil Hughes	2017-08-18	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35269
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-09-06	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053
\| * \| \| \| \| \| \| \| \| \|	Resolve outdated diff discussions on push	Sean McGivern	2017-09-06	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-09-06	1	-2/+9
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'19650-remove-admin-section-from-search-results-if-user-doesnt-have-access' into 'master' Hide admin link from default search results for non-admins Closes #19650 See merge request !14015
\| * \| \| \| \| \| \| \| \|	Hide admin link from default search results for non-admins	Mark Fletcher	2017-09-06	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Clean up new navigation templates	Phil Hughes	2017-09-06	5	-26/+5
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '35424-navigation-updates' into 'master'	Filipa Lacerda	2017-09-05	1	-1/+9
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Navigation updates Closes #35424 and #35091 See merge request !13480
\| * \| \| \| \| \| \| \|	Top navigation updates	Annabel Dunstone Gray	2017-09-05	1	-1/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '35010-remove-goto-project-from-breadcrumb' into 'master'	Filipa Lacerda	2017-09-05	1	-6/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove project select dropdown from breadcrumb Closes #35010 See merge request !14010
\| * \| \| \| \| \| \| \|	Remove project select dropdown from breadcrumb	kushalpandya	2017-09-05	1	-6/+0
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Re-use issue/MR counts for the pagination systemmr-index-page-performance	Yorick Peterse	2017-09-05	1	-1/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the issue and MR index pages so the pagination system re-uses the output of the COUNT() query used to calculate the number of rows per state (opened, closed, etc). This removes the need for an additional COUNT() on both pages.
* \| \| \| \| \| \|	Merge branch 'remove-unused-code-issueshelper' into 'master'	Rémy Coutable	2017-09-04	2	-35/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused methods from `IssuesHelper` and `IssuablesHelper` See merge request !13793
\| * \| \| \| \| \|	Remove unused `IssuesHelper#merge_requests_sentence`	Mehdi Lahmam	2017-08-24	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Its last usage has been removed at eb3e7bdfd8.
\| * \| \| \| \| \|	Removed unused `IssuablesHelper#issuable_state_scope`	Mehdi Lahmam	2017-08-24	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Its last usage has been removed at 260c8da060.