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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Force non diff resolved discussion to display when collapse toggled	Clement Ho	2017-10-20	1	-1/+1
\|
*	Merge branch '37391-wiki-disk-path-helper' into 'master'	Nick Thomas	2017-10-20	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Use wiki.disk_path See merge request gitlab-org/gitlab-ce!14930
\| *	Use wiki.disk_path	Nick Thomas	2017-10-18	1	-1/+1
\| \|
* \|	Merge branch 'animate-auto-devops' into 'master'	Annabel Dunstone Gray	2017-10-20	2	-2/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animate auto devops graphic Closes #39242 See merge request gitlab-org/gitlab-ce!14931
\| * \|	Animate auto devops graphicanimate-auto-devops	Clement Ho	2017-10-18	2	-2/+13
\| \| \|
* \| \|	Merge branch 'update-nav-sidebar-hover' into 'master'	Annabel Dunstone Gray	2017-10-19	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update nav sidebar hover color to increase contrast Closes #37660 See merge request gitlab-org/gitlab-ce!14829
\| * \| \|	update nav sidebar hover color to increase contrastupdate-nav-sidebar-hover	tauriedavis	2017-10-11	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'not-found-in-commits' into 'master'	Douwe Maan	2017-10-19	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders 404 in commits controller if no commits are found Closes #37620 See merge request gitlab-org/gitlab-ce!14610
\| * \| \| \|	Renders 404 in commits controller if no commits are found	Guilherme Vieira	2017-10-18	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-fix-broken-docker-delete' into 'master'	Grzegorz Bizon	2017-10-19	3	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inability to delete container registry tags Closes #39260 See merge request gitlab-org/gitlab-ce!14947
\| * \| \| \| \|	Fix broken function invocationsh-fix-broken-docker-delete	Filipa Lacerda	2017-10-19	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix inability to delete container registry tags	Stan Hu	2017-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
* \| \| \| \| \|	Merge branch '38648-members-sidebar' into 'master'	Phil Hughes	2017-10-19	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add members flyout on collapsed sidebar Closes #38648 See merge request gitlab-org/gitlab-ce!14942
\| * \| \| \| \| \|	Add members flyout on collapsed sidebar38648-members-sidebar	Annabel Dunstone Gray	2017-10-18	1	-0/+5
\| \|/ / / / /
* \| \| \| \| \|	Remove dropzoneInput from global namespace	Filipa Lacerda	2017-10-19	5	-306/+268
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '36160-zindex' into 'master'	Annabel Dunstone Gray	2017-10-18	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decreases z-index of select2 to a lower number of our navigation bar Closes #36160 See merge request gitlab-org/gitlab-ce!14925
\| * \| \| \| \|	Decreases z-index of select2 to a lower number of our navigation bar36160-zindex	Filipa Lacerda	2017-10-18	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'pms-fix-tooltip-padding' into 'master'	Annabel Dunstone Gray	2017-10-18	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tooltip padding to align to 8px grid See merge request gitlab-org/gitlab-ce!14928
\| * \| \| \| \| \|	Fix tooltip padding to align to 8px gridpms-fix-tooltip-padding	Pedro Moreira da Silva	2017-10-18	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bvl-fix-locale-path' into 'master'	Tim Zallmann	2017-10-18	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924
\| * \| \| \| \| \| \|	Build the locale path with an `_` instead of a `-`	Bob Van Landuyt	2017-10-18	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code.
* \| \| \| \| \| \| \|	Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'	Tim Zallmann	2017-10-18	1	-8/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add lazy option to UserAvatarImage See merge request gitlab-org/gitlab-ce!14895
\| * \| \| \| \| \| \| \|	Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-component	Eric Eastwood	2017-10-17	1	-8/+23
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix resolved discussions not expanding on side by side view	Clement Ho	2017-10-18	1	-2/+2
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix Pikaday	Filipa Lacerda	2017-10-18	8	-46/+70
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iteration	Phil Hughes	2017-10-18	2	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace google login image Closes #39201 See merge request gitlab-org/gitlab-ce!14919
\| * \| \| \| \| \| \|	Replace google login image39201-improve-google-image	Filipa Lacerda	2017-10-17	2	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-security-fix-backports-master' into 'master'	Robert Speicher	2017-10-18	6	-20/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
\| * \ \ \ \ \ \ \	Merge branch 'master' into sh-security-fix-backports-master	Stan Hu	2017-10-17	105	-1340/+2337
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'security-10-1' into '10-1-stable'	Jen-Shin Lin	2017-10-17	6	-20/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209
* \| \| \| \| \| \| \| \|	Merge branch '30140-restore-readme-only-preference' into 'master'	Douwe Maan	2017-10-18	3	-8/+27
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900
\| * \| \| \| \| \| \| \|	Small code style changes	Douwe Maan	2017-10-18	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add readme title and check for rich_viewer30140-restore-readme-only-preference	Annabel Dunstone Gray	2017-10-17	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix spec	Annabel Dunstone Gray	2017-10-16	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add readme only option as project view	Annabel Dunstone Gray	2017-10-16	3	-8/+23
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'	Grzegorz Bizon	2017-10-18	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917
\| * \| \| \| \| \| \| \|	Add short_revision and use total_size	Kamil Trzcinski	2017-10-17	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ph-multi-file-editor-restructure-data' into 'master'	Filipa Lacerda	2017-10-17	21	-508/+358
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored multi-file data structure See merge request gitlab-org/gitlab-ce!14862
\| * \| \| \| \| \| \| \| \|	Fixed bug when clicking file link causing user to navigate away	Phil Hughes	2017-10-17	11	-33/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a test for flattenedFiles Changes the data method to not be an arrow method Various other review fixes
\| * \| \| \| \| \| \| \| \|	fixed prev directory row not correctly having colspan	Phil Hughes	2017-10-16	3	-9/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	made serializing generic	Phil Hughes	2017-10-16	4	-26/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed previous directory showing when it shouldnt
\| * \| \| \| \| \| \| \| \|	fixed rendering bugs	Phil Hughes	2017-10-16	5	-18/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed eslint
\| * \| \| \| \| \| \| \| \|	Spec updates	Phil Hughes	2017-10-16	3	-26/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated as best as possible, a lot of tests still change the store and never reset the state back which can cause some issues with other tests.
\| * \| \| \| \| \| \| \| \|	Refactored multi-file data structure	Phil Hughes	2017-10-16	16	-450/+301
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves away from storing in a single array just to render the table. It now stores in a multi-dimensional array/object type where each entry in the array can have its own tree. This makes storing the data for future feature a little easier as there is only one way to store the data. Previously to insert a directory the code had to insert the directory & then the file at the right point in the array. Now the directory can be inserted anywhere & then a file can be quickly added into this directory. The rendering is still done with a single array, but this is handled through underscore. Underscore takes the array & then goes through each item to flatten it into one. It is done this way to save changing the markup away from table, keeping it as a table keeps it semantically correct.
* \| \| \| \| \| \| \| \| \|	Add inline edit button to issue_show app	Clement Ho	2017-10-17	4	-14/+72
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Change project deletion message from alert to notice	Winnie Hellmann	2017-10-17	1	-1/+1
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-deleting-forked-projects' into 'master'	Douwe Maan	2017-10-17	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors when deleting a forked project Closes #39196 See merge request gitlab-org/gitlab-ce!14916
\| * \| \| \| \| \| \| \| \|	Fix errors when deleting a forked project	Bob Van Landuyt	2017-10-17	2	-2/+2
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem would occur when the `ForkedProjectLink` was deleted, but the `ForkNetworkMember` was not. The delete would be rolled back and retried. But the error would not be saved because `Project#forked?` would still be true, because the `ForkNetworkMember` exists. But the `Project#forked_project_link` would be `nil`. So the validation for the visibility level would fail.
* \| \| \| \| \| \| \| \|	Merge branch '38156-breadcrumbs-margin' into 'master'	Tim Zallmann	2017-10-17	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use variable for mobile breadcrumbs padding Closes #38156 See merge request gitlab-org/gitlab-ce!14904
\| * \| \| \| \| \| \| \| \|	Use variable for mobile breadcrumbs padding38156-breadcrumbs-margin	Annabel Dunstone Gray	2017-10-16	1	-1/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|