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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'osw-suggest-diff-line-change' into 'master'	Phil Hughes	2018-12-13	86	-25/+2150
\|\ \| \| \| \| \| \| \| \|	Allow suggesting single line changes in diffs See merge request gitlab-org/gitlab-ce!23147
\| *	Allow suggesting single line changes in diffs	Oswaldo Ferreira	2018-12-13	86	-25/+2150
\|/
*	Merge branch 'strict_fs_benchmarks' into 'master'	Achilleas Pipinellis	2018-12-13	1	-9/+7
\|\ \| \| \| \| \| \| \| \|	Update Filesystem Benchmarking to be more strict See merge request gitlab-org/gitlab-ce!23709
\| *	Update Filesystem Benchmarking to be more strict	Drew Blessing	2018-12-13	1	-9/+7
\|/
*	Merge branch 'docs-fix-base64-examples' into 'master'	Achilleas Pipinellis	2018-12-13	2	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix base64 example to use universal option Closes #55218 See merge request gitlab-org/gitlab-ce!23787
\| *	Fix base64 example to use universal option	Thong Kuah	2018-12-13	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	`-D` is OSX speific and is invalid on Linux, etc Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/55218
* \|	Merge branch 'qa-fix-nightly-42' into 'master'	Mark Lapierre	2018-12-13	3	-2/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Fix the 'Commit data' QA test Closes gitlab-org/quality/nightly#42 See merge request gitlab-org/gitlab-ce!23800
\| * \|	[QA] Fix the 'Commit data' QA test	Rémy Coutable	2018-12-13	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now visit the project/wiki page after a push since that's the logical page where we should be after a push. Also, we now properly set the `@project` variable because the `web_url` of a Push resource isn't necessarily it's project/wiki page (if the project/wiki are created via the API for instance, `current_url` would be the current page, not the project/wiki page). Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'revert-accidental-master-push' into 'master'	Achilleas Pipinellis	2018-12-13	1	-19/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Document gitaly network architecture" See merge request gitlab-org/gitlab-ce!23743
\| * \| \|	Revert "Document gitaly network architecture"	Jacob Vosmaer	2018-12-11	1	-19/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit cc7353523bc1d19054769d7a0a61b0cb7f6ce4e3. I pushed this commit to master accidentally. Oops!
* \| \| \|	Merge branch 'docs/fix-automatic-merge-documentation' into 'master'	Robert Speicher	2018-12-13	1	-11/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix documentation for automatic merging See merge request gitlab-org/gitlab-ce!23784
\| * \| \| \|	Fix documentation for automatic merging	Yorick Peterse	2018-12-13	1	-11/+13
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The strategy name and interval was incorrect, and the link back to the developer documentation was in the wrong place.
* \| \| \|	Merge branch '54736-sign-in-bottom-margin' into 'master'	Annabel Dunstone Gray	2018-12-13	3	-3/+9
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add margin to .row on signin page and fix missing border-radius Closes #54736 See merge request gitlab-org/gitlab-ce!23739
\| * \| \|	54376 Add changelog	Paul Gear	2018-12-13	1	-0/+5
\| \| \| \|
\| * \| \|	54376 Add margin to .row on signin page	Paul Gear	2018-12-13	1	-1/+1
\| \| \| \|
\| * \| \|	54376 Fix border radius for omniauth signin block	Paul Gear	2018-12-13	1	-2/+3
\| \| \| \|
* \| \| \|	Merge branch '51994-disable-merging-labels-in-dropdowns' into 'master'	Fatih Acet	2018-12-13	11	-284/+41
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix labels dropdown with multiple same names" Closes #51994 See merge request gitlab-org/gitlab-ce!23265
\| * \| \| \|	Fix failed tests and add extra test	Heinrich Lee Yu	2018-12-06	4	-8/+26
\| \| \| \| \|
\| * \| \| \|	Add changelog entry	Heinrich Lee Yu	2018-12-06	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Allow creating label lists with the same label name	Heinrich Lee Yu	2018-12-06	2	-2/+7
\| \| \| \| \|
\| * \| \| \|	Allow adding of duplicate label names in boards	Heinrich Lee Yu	2018-12-06	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Disable duplicate label merging in other dropdowns	Heinrich Lee Yu	2018-12-06	1	-28/+4
\| \| \| \| \|
\| * \| \| \|	Disable duplicate label merging in search bar dropdown	Heinrich Lee Yu	2018-12-06	4	-248/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gt-update-navigation-theme-colors' into 'master'	Phil Hughes	2018-12-13	3	-8/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update header navigation theme colors Closes #49658 See merge request gitlab-org/gitlab-ce!23734
\| * \| \| \| \|	Update header navigation theme colors	George Tsiolis	2018-12-13	3	-8/+14
\|/ / / / /
* \| \| \| \|	Merge branch 'fix-calendar-events-fetching-error' into 'master'	Fatih Acet	2018-12-13	2	-0/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix calendar events fetching error on private profile page. Closes #54938 See merge request gitlab-org/gitlab-ce!23718
\| * \| \| \| \|	Fix calendar events fetching error on private profile page.	Harry Kiselev	2018-12-13	2	-0/+7
\|/ / / / /
* \| \| \| \|	Merge branch '55257-fix-sm-button-sizes' into 'master'	Fatih Acet	2018-12-13	2	-3/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix small button line height Closes #55257 See merge request gitlab-org/gitlab-ce!23779
\| * \| \| \| \|	Fix small button line height	Paul Slaughter	2018-12-12	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? Commit 75496059 accidentally changed line height for all small buttons. This fixes that by introducing some `btn-xs` variables.
* \| \| \| \| \|	Merge branch 'mg-update-eslint-config' into 'master'	Clement Ho	2018-12-13	3	-59/+119
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update eslint dependencies See merge request gitlab-org/gitlab-ce!23610
\| * \| \| \| \| \|	Disable vue/use-v-on-exact due to confusing rule violations	Mike Greiling	2018-12-11	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update gitlab's eslint-config to latest	Mike Greiling	2018-12-11	2	-25/+39
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Upgrade eslint dependencies	Mike Greiling	2018-12-11	2	-35/+80
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '51944-redesign-project-lists-ui' into 'master'	Sean McGivern	2018-12-13	13	-73/+348
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Redesign project lists UI" Closes #51944 See merge request gitlab-org/gitlab-ce!22682
\| * \| \| \| \| \|	Resolve "Redesign project lists UI"	Martin Wortschack	2018-12-13	13	-73/+348
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'diff-empty-state-fixes' into 'master'	Filipa Lacerda	2018-12-13	8	-47/+169
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff changes empty state Closes #48635 See merge request gitlab-org/gitlab-ce!23767
\| * \| \| \| \| \|	Fix diff changes empty state	Phil Hughes	2018-12-13	8	-47/+169
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The empty state now only gets shown when no files exist in the branch. If the user is reviewing 2 versions with no files, we don't show the state. Refactors the diff app spec to use Vue test utils. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
* \| \| \| \| \| \|	Merge branch 'list-id' into 'master'	Sean McGivern	2018-12-13	6	-1/+91
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add List-Id to notification emails Closes #53493 See merge request gitlab-org/gitlab-ce!22817
\| * \| \| \| \| \| \|	Add List-Id to notification emails	Olivier Crête	2018-12-13	6	-1/+91
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '52774-fix-svgs-in-ie-11' into 'master'	Mike Greiling	2018-12-13	3	-5/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IE11: Fix sprite icon rendering Closes #52774 See merge request gitlab-org/gitlab-ce!23773
\| * \| \| \| \| \| \|	IE11: Fix sprite icon rendering	Lukas Eipert	2018-12-12	3	-5/+10
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-backup-restore-object-pools' into 'master'	Douwe Maan	2018-12-13	6	-1/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore Object Pools when restoring an object pool Closes gitaly#1355 See merge request gitlab-org/gitlab-ce!23682
\| * \| \| \| \| \| \|	Restore Object Pools when restoring an object pool	Zeger-Jan van de Weg	2018-12-13	6	-1/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pool repositories are persisted in the database, and when the DB is restored, the data need to be restored on disk. This is done by resetting the state machine and rescheduling the object pool creation. This is not an exact replica of the state like at the time of the creation of the backup. However, the data is consistent again. Dumping isn't required as internally GitLab uses git bundles which bundle all refs and include all objects in the bundle that they require, reduplicating as more repositories get backed up. This does require more data to be stored. Fixes https://gitlab.com/gitlab-org/gitaly/issues/1355
* \| \| \| \| \| \| \|	Merge branch 're-define-default-only-except-policy' into 'master'	Grzegorz Bizon	2018-12-13	13	-254/+223
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-define default only except policy Closes #55099 See merge request gitlab-org/gitlab-ce!23765
\| * \| \| \| \| \| \|	Re-define default only except policy	Kamil Trzciński	2018-12-13	13	-254/+223
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'gt-update-environment-breadcrumb' into 'master'	Filipa Lacerda	2018-12-13	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update environments breadcrumb Closes #48048 See merge request gitlab-org/gitlab-ce!23751
\| * \| \| \| \| \| \|	Update environments breadcrumb	George Tsiolis	2018-12-11	2	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fixed-diff-notes-not-showing-ce' into 'master'	Filipa Lacerda	2018-12-13	2	-28/+102
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed notes not being applied to diff lines Closes #55245 and #55248 See merge request gitlab-org/gitlab-ce!23778
\| * \| \| \| \| \| \| \|	Fixed parallel discussions throwing an error	Phil Hughes	2018-12-13	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added test	Phil Hughes	2018-12-12	1	-0/+81
\| \| \| \| \| \| \| \| \|