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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix tooltip padding to align to 8px gridpms-fix-tooltip-padding	Pedro Moreira da Silva	2017-10-18	1	-1/+1
\|
*	Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'	Sean McGivern	2017-10-18	6	-36/+110
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#write_page to Gitaly Closes gitaly#638 See merge request gitlab-org/gitlab-ce!14870
\| *	Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitaly	Ahmad Sherif	2017-10-16	6	-36/+110
\| \| \| \| \| \| \| \|	Closes gitaly#638
* \|	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	14	-80/+149
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
\| * \| \|	Remove already released CHANGELOG filessh-security-fix-backports-master	Stan Hu	2017-10-17	3	-15/+0
\| \| \| \|
\| * \| \|	Merge branch 'master' into sh-security-fix-backports-master	Stan Hu	2017-10-17	234	-2291/+6407
\| \|\ \ \
\| * \| \| \|	Merge branch 'security-10-1' into '10-1-stable'	Jen-Shin Lin	2017-10-17	16	-80/+141
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209
\| * \| \| \|	Update CHANGELOG.md for 10.0.4	Jarka Kadlecova	2017-10-16	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Update CHANGELOG.md for 9.5.9	Jarka Kadlecova	2017-10-16	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Update CHANGELOG.md for 9.4.7	Jarka Kadlecova	2017-10-16	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch '30140-restore-readme-only-preference' into 'master'	Douwe Maan	2017-10-18	6	-14/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-14/+37
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '37032-get-project-branch-invalid-name-message' into 'master'	Rémy Coutable	2017-10-18	4	-8/+62
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get Project Branch API shows an helpful error message on invalid refname Closes #37032 See merge request gitlab-org/gitlab-ce!14884
\| * \| \| \| \| \|	Get Project Branch API shows an helpful error message on invalid refname	Jacopo	2017-10-18	4	-8/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In API v4 when requesting a branch with an invalid refname shows an helpful error message: 'The branch refname is invalid'.
* \| \| \| \| \| \|	Merge branch 'tc-saml-fix-false-empty' into 'master'	Douwe Maan	2017-10-18	6	-22/+74
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SAML fix when auth hash attributes do not define groups Closes #38923 See merge request gitlab-org/gitlab-ce!14913
\| * \| \| \| \| \| \|	Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-empty	Toon Claes	2017-10-18	6	-22/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there are no groups defined in the auth hash attributes, `Gitlab::Saml::AuthHash#groups` should return an empty array, and `Gitlab::Saml::User#find_user` should not mark the user as external. Closes gitlab-org/gitlab-ce#38923.
* \| \| \| \| \| \| \|	Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'	Grzegorz Bizon	2017-10-18	6	-7/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917
\| * \| \| \| \| \| \| \|	Fix broken testkt/bug/fix-revision-and-size-for-container-registry	Filipa Lacerda	2017-10-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix failed test	Kamil Trzcinski	2017-10-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add short_revision and use total_size	Kamil Trzcinski	2017-10-17	6	-5/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve-database-yml-examples' into 'master'	Rémy Coutable	2017-10-18	3	-18/+30
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve database yml examples See merge request gitlab-org/gitlab-ce!10247
\| * \| \| \| \| \| \| \|	Update scripts/prepare_build.sh	bogdanvlviv	2017-10-17	1	-4/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update database.yml.postgresql	bogdanvlviv	2017-10-17	1	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	host is omitted by default
\| * \| \| \| \| \| \| \|	Set 'staging specific' in database.yml.mysql	bogdanvlviv	2017-10-17	1	-3/+18
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ph-multi-file-editor-restructure-data' into 'master'	Filipa Lacerda	2017-10-17	33	-735/+522
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored multi-file data structure See merge request gitlab-org/gitlab-ce!14862
\| * \| \| \| \| \| \| \|	fixed Karam test because of event name changeph-multi-file-editor-restructure-data	Phil Hughes	2017-10-17	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed bug when clicking file link causing user to navigate away	Phil Hughes	2017-10-17	13	-35/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed karma spec with prev directory button	Phil Hughes	2017-10-16	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed karma build because of a removed method	Phil Hughes	2017-10-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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	6	-18/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed eslint
\| * \| \| \| \| \| \| \|	Spec updates	Phil Hughes	2017-10-16	14	-221/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	17	-483/+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.
* \| \| \| \| \| \| \| \|	Merge branch 'add-inline-edit-button' into 'master'	Filipa Lacerda	2017-10-17	6	-17/+119
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add inline edit button to issue_show app See merge request gitlab-org/gitlab-ce!14875
\| * \| \| \| \| \| \| \| \|	Add inline edit button to issue_show app	Clement Ho	2017-10-17	6	-17/+119
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'winh-project-deletion-message' into 'master'	Annabel Dunstone Gray	2017-10-17	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change project deletion message from alert to notice Closes #26956 See merge request gitlab-org/gitlab-ce!14756
\| * \| \| \| \| \| \| \| \|	Change project deletion message from alert to notice	Winnie Hellmann	2017-10-17	2	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-10-17	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'20930-very-first-commit-to-default-branch-didn-t-close-referenced-issue' into 'master' Fix #20930: automatic closing is not triggered on very first push. Closes #20930 See merge request gitlab-org/gitlab-ce!11899
\| * \| \| \| \| \| \| \| \|	Fix #20930: automatic closing is not triggered on very first push.	Sébastien	2017-10-17	1	-3/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'move-user-avatar-specs' into 'master'	Phil Hughes	2017-10-17	3	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move user avatar specs to folder to mimic javascript directory Closes #39169 See merge request gitlab-org/gitlab-ce!14901
\| * \| \| \| \| \| \| \| \|	Move user avatar specs to folder to mimic javascript directorymove-user-avatar-specs	Clement Ho	2017-10-16	3	-0/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'improve-sprite-icon-spec' into 'master'	Phil Hughes	2017-10-17	1	-10/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve sprite icon spec Closes #39199 See merge request gitlab-org/gitlab-ce!14914
\| * \| \| \| \| \| \| \| \|	Improve sprite icon spec	Clement Ho	2017-10-17	1	-10/+18
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-do-not-use-redis-keys' into 'master'	Rémy Coutable	2017-10-17	6	-36/+33
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889