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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed commit avatar being aligned verticallycommit-row-avatar-align-top	Phil Hughes	2017-09-29	2	-0/+9
\| \| \| \|	Closes #38411
*	Merge branch '38582-popover-badge' into 'master'	Phil Hughes	2017-09-29	2	-2/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improves UX of autodevops popover to match gpg one Closes #38582 See merge request gitlab-org/gitlab-ce!14582
\| *	Improves UX of autodevops popover to match gpg one	Filipa Lacerda	2017-09-29	2	-2/+7
\| \|
* \|	Merge branch 'hash-mr-scroll-load' into 'master'	Filipa Lacerda	2017-09-29	3	-16/+72
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed anchored content not being scrolled into view Closes #38326 See merge request gitlab-org/gitlab-ce!14562
\| * \|	spec fixhash-mr-scroll-load	Phil Hughes	2017-09-29	1	-7/+3
\| \| \|
\| * \|	CHANGELOG item	Phil Hughes	2017-09-29	1	-0/+5
\| \| \|
\| * \|	Fixed anchored content not being scrolled into view	Phil Hughes	2017-09-29	2	-16/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly scrolls anchored content into view when the user loads the page. This is most obvious when the user loads a link note in a merge request & the page does not scroll down to the note. Closes #38326
* \| \|	Merge branch 'jramsay-4012-externalize-wiki-strings' into 'master'38609-generalise-pop-overs-to-work-on-hover-and-implement-in-existing-places	Douwe Maan	2017-09-29	12	-64/+186
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add translatable strings to wiki pages See merge request gitlab-org/gitlab-ce!14534
\| * \| \|	Add translatable strings to wiki pagesjramsay-4012-externalize-wiki-strings	James Ramsay	2017-09-28	12	-64/+186
\| \| \| \|
* \| \| \|	Merge branch ↵	Rémy Coutable	2017-09-29	5	-25/+226
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Insert at most 1,000 rows at once in MR diff background migration Closes #36631 et #37505 See merge request gitlab-org/gitlab-ce!13661
\| * \| \| \|	Reschedule merge request diff background migration36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout	Sean McGivern	2017-09-29	3	-0/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The first attempt didn't migrate all rows on GitLab.com, due to a couple of issues: 1. Some rows in merge_request_diffs had truly huge numbers of commits and diffs serialised - one in particular had 26,000 commits! 2. The jobs were sometimes on Sidekiq hosts with frequent OOM errors, leading to the job being lost. The previous commit adds more logging, and a more robust insertion method. This commit reschedules the jobs, with a generous pause between each.
\| * \| \| \|	Make MR diff background migration less likely to time out	Sean McGivern	2017-09-29	2	-31/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This version does not use transactions, but individual statements. As we have unique constraints on the target tables for the inserts, we can just ignore uniqueness violations there (as long as we always insert the same batch size, in the same order). This means the spec now must use truncation, not a transaction, as the uniqueness violation means that the whole transaction for that spec would be invalid, which isn't what we'd want. In real-world use, this isn't run in a transaction anyway. This commit also wraps unhandled exceptions, for easier finding in Sentry, and logs with a consistent format, for easier searching.
\| * \| \| \|	Insert at most 1,000 rows at once in MR diff background migration	Sean McGivern	2017-09-29	2	-5/+39
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were hitting the statement timeout for very large MR diffs. Now we insert at most 1,000 rows to `merge_request_diff_commits` in a single statement, or 100 rows to `merge_request_diff_files`.
* \| \| \|	Merge branch 'icons-update-nav-bars' into 'master'	Phil Hughes	2017-09-29	21	-3366/+67
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated All Navigation Icons to Sprite_Icons See merge request gitlab-org/gitlab-ce!14559
\| * \| \| \|	FIxed the clearing icon + jumping of fluid nav baricons-update-nav-bars	Tim Zallmann	2017-09-29	2	-1/+2
\| \| \| \| \|
\| * \| \| \|	Fixed another linting error this time HAML	Tim Zallmann	2017-09-28	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed CSS Lint Error	Tim Zallmann	2017-09-28	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Updated All Navigation Icons to Sprite_Icons	Tim Zallmann	2017-09-28	20	-3365/+65
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-json-page-title' into 'master'	Jacob Schatz	2017-09-29	7	-6/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use backend-provided page title in repo editor Closes #36029 See merge request gitlab-org/gitlab-ce!13763
\| * \| \| \| \|	Title has now its own testdm-json-page-title	Tim Zallmann	2017-09-29	1	-4/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Not the Test will also work with other tests before	Tim Zallmann	2017-09-29	2	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Added Test for PageTitle / Removed Gitlab Part from TItle	Tim Zallmann	2017-09-29	2	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Encode Page-Title header as ISO-8859-1	Douwe Maan	2017-09-26	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Added Page Title setting for files + directories	Tim Zallmann	2017-09-26	2	-4/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Add Page-Title header to tree and blob JSON endpoints	Douwe Maan	2017-09-26	4	-1/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'accepting-merge-requests-ux' into 'master'	Victor Wu	2017-09-29	1	-4/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tell community members to ping PM when working on an issue See merge request gitlab-org/gitlab-ce!14571
\| * \| \| \| \| \|	Update CONTRIBUTING.mdaccepting-merge-requests-ux	Victor Wu	2017-09-28	1	-4/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'make-has-visible-commit-more-efficient' into 'master'	Rémy Coutable	2017-09-29	6	-22/+91
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Repository#has_visible_content more efficient See merge request gitlab-org/gitlab-ce!14554
\| * \| \| \| \| \| \|	Make Repository#has_visible_content more efficient	Jacob Vosmaer (GitLab)	2017-09-29	6	-22/+91
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '38432-fix-notes-type-for-import' into 'master'	Rémy Coutable	2017-09-29	12	-37/+155
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notes type created from import Closes #38432 See merge request gitlab-org/gitlab-ce!14524
\| * \| \| \| \| \|	Fix notes type created from import	Lin Jen-Shin (godfat)	2017-09-29	12	-37/+155
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'add-composite-index-on-merge-requests-merge-commit-sha' into ↵	Sean McGivern	2017-09-29	3	-1/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add index for merge_requests.merge_commit_sha Closes #38507 See merge request gitlab-org/gitlab-ce!14549
\| * \| \| \| \| \|	Add index for merge_requests.merge_commit_shaadd-composite-index-on-merge-requests-merge-commit-sha	Yorick Peterse	2017-09-28	3	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a composite index on (target_project_id, merge_commit_sha, id) that allows queries such as the following to use a full backwards index scan: SELECT "merge_requests".* FROM "merge_requests" WHERE "merge_requests"."deleted_at" IS NULL AND "merge_requests"."target_project_id" = 13083 AND "merge_requests"."merge_commit_sha" = 'e80a893ff0ea8466099f6478183631af55933db2' ORDER BY "merge_requests"."id" DESC LIMIT 1; Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38507
* \| \| \| \| \| \|	Merge branch 'first-time-contributor-tooltip-text' into 'master'	Filipa Lacerda	2017-09-29	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweaked the first time contributor tooltip text See merge request gitlab-org/gitlab-ce!14565
\| * \| \| \| \| \| \|	Tweaked the first time contributor tooltip textfirst-time-contributor-tooltip-text	Phil Hughes	2017-09-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the text `Handle with care` as it sounds condescending.
* \| \| \| \| \| \| \|	Merge branch 'docs-fix-auto-devops-banner-feature-flag' into 'master'	Grzegorz Bizon	2017-09-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Auto DevOps banner feature flag Closes #38576 See merge request gitlab-org/gitlab-ce!14576
\| * \| \| \| \| \| \| \|	Fix Auto DevOps banner feature flag	Fabio Busatto	2017-09-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'breadcrumb-item-links' into 'master'	Tim Zallmann	2017-09-29	6	-9/+18
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed breadcrumb title not linking Closes #38059 See merge request gitlab-org/gitlab-ce!14532
\| * \| \| \| \| \| \| \|	spec fixesbreadcrumb-item-links	Phil Hughes	2017-09-28	2	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed breadcrumb title not linking	Phil Hughes	2017-09-27	4	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the breadcrumb titles not having links. This was a regression in the updated breadcrumbs introduced in 10.0. This introduces the link for all pages rather than selectively doing it. This will cover issues, merge requests, pipelines, jobs etc. Closes #38059
* \| \| \| \| \| \| \| \|	Merge branch 'remove-target-dd' into 'master'	Filipa Lacerda	2017-09-29	7	-39/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove target dd Closes #38485 See merge request gitlab-org/gitlab-ce!14558
\| * \| \| \| \| \| \| \|	Fix static analysis.remove-target-dd	Jacob Schatz	2017-09-28	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix karma test	Jacob Schatz	2017-09-28	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removes the target branch and only uses the source branch.	Jacob Schatz	2017-09-28	4	-16/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove target ref switcher.	Jacob Schatz	2017-09-28	2	-20/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '37335-counter-active-state' into 'master'	Phil Hughes	2017-09-29	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add active states to nav bar counters Closes #37335 See merge request gitlab-org/gitlab-ce!14569
\| * \| \| \| \| \| \| \| \|	Add active states to nav bar counters37335-counter-active-state	Annabel Dunstone Gray	2017-09-28	2	-3/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '38528-build-url' into 'master'	Phil Hughes	2017-09-29	3	-1/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes data parameter not being sent in ajax request for jobs log Closes #38528 See merge request gitlab-org/gitlab-ce!14564
\| * \| \| \| \| \| \| \| \| \|	Fixes data parameter not being sent in ajax request for jobs log38528-build-url	Filipa Lacerda	2017-09-28	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '31113-add-guidelines-for-illustrations' into 'master'	Mike Greiling	2017-09-29	15	-0/+91
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guidelines for illustrations See merge request gitlab-org/gitlab-ce!13097