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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branch	Pawel Chojnacki	2017-06-22	57	-819/+699
\|\ \| \| \| \| \| \|	28717-additional-metrics-review-branch
\| *	Merge branch '33904-edit-issue-warning' into 'master'	Phil Hughes	2017-06-22	2	-10/+6
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't show "Someone edited the issue" warning when saving issue Closes #33904 See merge request !12371
\| \| *	don't show "Someone edited the issue" warning when saving issue33904-edit-issue-warning	Simon Knox	2017-06-22	2	-10/+6
\| \| \| \| \| \| \| \| \| \| \| \|	don't need to check for form visible because error message isn't rendered otherwise
\| * \|	File view buttons	Annabel Dunstone Gray	2017-06-22	2	-18/+69
\| \| \|
\| * \|	Merge branch '33853-environments-buttons' into 'master'	Phil Hughes	2017-06-22	1	-2/+13
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show gray footer space if environment actions exist Closes #33853 See merge request !12315
\| \| * \|	Only show gray footer space if environment actions exist33853-environments-buttons	Annabel Dunstone Gray	2017-06-21	1	-2/+13
\| \| \| \|
\| * \| \|	Merge branch '33833-issue-and-mr-state-tabs-don-t-work-on-dashboard' into ↵	Jacob Schatz	2017-06-22	2	-25/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Issue and MR state tabs don't work on dashboard" Closes #33833 See merge request !12278
\| \| * \| \|	Revert to using links instead of buttons in Issuable Index tabs.	Bryce Johnson	2017-06-21	2	-25/+3
\| \| \|/ /
\| * \| \|	Resolve "MR comment + system note highlight don't have the same width"	Mike Greiling	2017-06-22	3	-34/+64
\| \| \| \|
\| * \| \|	Merge branch 'system-note-commits-list-gradient-fix' into 'master'	Annabel Dunstone Gray	2017-06-21	2	-1/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed commit list system not gradient Closes #33896 See merge request !12306
\| \| * \| \|	Fixed commit list system not gradientsystem-note-commits-list-gradient-fix	Phil Hughes	2017-06-20	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33896
\| * \| \| \|	Merge branch '33441_supplement_simplified_chinese_translation_of_i18n' into ↵	Douwe Maan	2017-06-21	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Supplement Simplified Chinese translation of Project Page & Repository Page Closes #33441 See merge request !11994
\| \| * \| \|	Change 'Committed by' Translate	黄涛	2017-06-20	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Translation optimization	黄涛	2017-06-20	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Modify the identified translations in the discussion. 2. rebase to master
\| \| \| * \| \|	add missing translation fields	黄涛	2017-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Follow up !12052 commits.
\| \| \| * \| \|	translation optimization in synchronous reviews	黄涛	2017-06-15	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	translation optimization in synchronous reviews	黄涛	2017-06-14	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Optimization 'zh_CN' translation	黄涛	2017-06-13	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Optimization 'zh_CN' translation	黄涛	2017-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Fix missing translations
\| \| \| * \| \|	optimize translation based on comments	黄涛	2017-06-13	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	supplement simplified chinese translation	黄涛	2017-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33441
\| \| * \| \| \|	supplement simplified chinese translation	黄涛	2017-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33441
\| * \| \| \| \|	Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d	winh	2017-06-21	6	-66/+26
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
\| * \| \| \|	Merge branch '34017-common-vue' into 'master'	Tim Zallmann	2017-06-21	2	-3/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove vue from main.bundle.js Closes #34017 See merge request !12327
\| \| * \| \| \|	Remove vue from main.bundle.js file being loaded through ↵34017-common-vue	Filipa Lacerda	2017-06-21	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`app/assets/javascripts/merge_request_tabs.js`
\| * \| \| \| \|	Resolve "Protected branch dropdowns cut-off in Repository Settings page"	Luke "Jared" Bennett	2017-06-21	2	-4/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Tim Zallmann	2017-06-21	24	-431/+320
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Bulk edit scroll fix	Bryce Johnson	2017-06-21	2	-4/+9
\| \| \|/ / / /
\| \| * \| \| \|	Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-bar	Jacob Schatz	2017-06-20	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note Closes #33868 See merge request !12297
\| \| \| * \| \| \|	Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editing	Eric Eastwood	2017-06-20	1	-1/+1
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868 While in a MR "Changes" tab looking at some diff note discussions. Clicking reply and pressing the up-arrow should edit your last comment in that discussion. I suspect this regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178 where we changed the selector
\| \| * \| \| \|	Merge branch 'fix-i18n-helpers' into 'master'	Douwe Maan	2017-06-20	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some incorrect usage of translation helpers See merge request !12274
\| \| \| * \| \| \|	Fix some incorrect usage of translation helpersfix-i18n-helpers	Ruben Davila	2017-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/projects/pipeline_schedules/_form.html.haml
\| \| * \| \| \| \|	Resolve "User customize callout has no top-margin on projects page"	Luke "Jared" Bennett	2017-06-20	3	-4/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'search-clear-button-center' into 'master'	Annabel Dunstone Gray	2017-06-20	1	-3/+0
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed filtered search clear button being off-center Closes #33912 See merge request !12304
\| \| \| * \| \| \| \|	Fixed filtered search clear button being off-centersearch-clear-button-center	Phil Hughes	2017-06-20	1	-3/+0
\| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33912
\| \| * \| \| \| \|	Uniformize code between both pipelines tables	Filipa Lacerda	2017-06-20	10	-357/+246
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revert	Clement Ho	2017-06-20	2	-30/+36
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert sticky confidential header Closes #33840 See merge request !12307
\| \| \| * \| \| \| \|	Revert sticky confidential header	Annabel Dunstone Gray	2017-06-20	2	-30/+36
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Stop showing task status if no tasks are present	Phil Hughes	2017-06-20	4	-31/+25
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the task status would be visible even if there where no tasks in the description. This fixes that by changing the regex to check for tasks without 0. This also fixes a bug where update the description inline would not update the task status text on screen. Closes #33880
\| * \| \| \| \| \|	Fixes scrolling + improves Performance through assigning found $ elements to ↵	Tim Zallmann	2017-06-20	2	-7/+16
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables
\| * \| \| \| \|	Merge branch '33865-add-emoji-parallel-view' into 'master'	Phil Hughes	2017-06-20	1	-5/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hover style for emoji button on parallel diff view Closes #33865 See merge request !12281
\| \| * \| \| \| \|	Fix hover style for emoji button on parallel diff view33865-add-emoji-parallel-view	Annabel Dunstone Gray	2017-06-19	1	-5/+0
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'	Phil Hughes	2017-06-20	1	-1/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note highlight being added when you don't have a URL fragment hash #note_xxx Closes #33916 See merge request !12293
\| \| * \| \| \| \|	Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcit	Eric Eastwood	2017-06-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use a explicit true/false value to set highlight because jQuery assumes `null` means toggle from whatever state and doesn't force false. Regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
\| * \| \| \| \| \|	Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'	Phil Hughes	2017-06-20	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue description syntax highlighting and math rendering Closes #33877 See merge request !12282
\| \| * \| \| \| \|	Fix issue description syntax highlighting and math rendering33877-fix-issue-description-highlight-and-math	Eric Eastwood	2017-06-19	1	-1/+1
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33877 Regressed in https://gitlab.com/gitlab-org/gitlab-ce/commit/5a95d6f8dae00b31b694759c6ddbf6d83b1a7890#3a15290e7696397415523e0b664aceb3dd4010ae_0_46 where the ref no longer matches what we call `renderGFM` on.
\| * \| \| \| \|	Merge branch 'fix-missing-function-dropzone-input' into 'master'	Stan Hu	2017-06-19	1	-0/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restored missing function inside dropzone_input.js Closes #33836 See merge request !12279
\| \| * \| \| \| \|	Restored missing function inside dropzone_input.js	Jose Ivan Vargas	2017-06-19	1	-0/+4
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'enable-autocomplete-on-project-snippets' into 'master'	Jacob Schatz	2017-06-19	1	-0/+2
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable autocomplete on project snippets Closes #33911 See merge request !12286
\| \| * \| \| \|	Enable autocomplete on project snippetsenable-autocomplete-on-project-snippets	Eric Eastwood	2017-06-19	1	-0/+2
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1210 disabled autocomplete for personal snippets and project snippets. But we want autocomplete on project snippets.