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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '18765-stub_env_in_specs' into 'master'	Robert Speicher	2017-10-19	5	-158/+131
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add a 'custom cop' to RuboCop that bans ENV assignment" Closes #18765 See merge request gitlab-org/gitlab-ce!14810
\| *	Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specs	Rémy Coutable	2017-10-18	1	-0/+59
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Stub ENV in the LDAP task spec file	Rémy Coutable	2017-10-18	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Stub ENV in the Gitaly task spec file	Rémy Coutable	2017-10-18	1	-8/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Stub ENV in the backup task spec file	Rémy Coutable	2017-10-18	2	-149/+70
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'not-found-in-commits' into 'master'	Douwe Maan	2017-10-19	1	-2/+29
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-2/+29
\| \| \|
* \| \|	Merge branch 'encoding-helper-performance' into 'master'	Rémy Coutable	2017-10-19	1	-2/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoind unnecesary `force_encoding` operations Closes #39227 See merge request gitlab-org/gitlab-ce!12167
\| * \| \|	Avoind unnecesary `force_encoding` operations	Alejandro Rodríguez	2017-10-18	1	-2/+14
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	They're costly. This will also avoid some edge cases where charlock_holmes assigns a weird encoding to a perfectly valid UTF-8 string.
* \| \|	Remove dropzoneInput from global namespace	Filipa Lacerda	2017-10-19	2	-3/+1
\|/ /
* \|	Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translations	Sean McGivern	2017-10-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	We don't want the locale to be set to Brazilian Portuguese for any subsequent specs!
* \|	Merge branch 'bvl-fix-locale-path' into 'master'	Tim Zallmann	2017-10-18	1	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-20/+50
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-20/+50
\| \| \| \|
* \| \| \|	Fix resolved discussions not expanding on side by side view	Clement Ho	2017-10-18	1	-5/+24
\| \| \| \|
* \| \| \|	Fix Pikaday	Filipa Lacerda	2017-10-18	1	-0/+29
\| \| \| \|
* \| \| \|	Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'	Sean McGivern	2017-10-18	1	-24/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-24/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#638
* \| \| \| \|	Merge branch 'sh-security-fix-backports-master' into 'master'	Robert Speicher	2017-10-18	6	-58/+99
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	67	-764/+3318
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'security-10-1' into '10-1-stable'	Jen-Shin Lin	2017-10-17	6	-58/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-6/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900
\| * \| \| \| \| \|	Add readme only option as project view	Annabel Dunstone Gray	2017-10-16	2	-6/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '37032-get-project-branch-invalid-name-message' into 'master'	Rémy Coutable	2017-10-18	2	-0/+43
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-21/+68
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-21/+68
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ph-multi-file-editor-restructure-data' into 'master'	Filipa Lacerda	2017-10-17	12	-227/+164
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a test for flattenedFiles Changes the data method to not be an arrow method Various other review fixes
\| * \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fixed rendering bugs	Phil Hughes	2017-10-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed eslint
\| * \| \| \| \| \| \| \|	Spec updates	Phil Hughes	2017-10-16	11	-195/+150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-33/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+47
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Change project deletion message from alert to notice	Winnie Hellmann	2017-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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	3	-30/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
\| * \| \| \| \| \| \| \| \| \|	Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keys	Bob Van Landuyt	2017-10-17	3	-30/+12
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-deleting-forked-projects' into 'master'	Douwe Maan	2017-10-17	1	-0/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+17
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'prevent-creating-multiple-application-settings' into 'master'	Yorick Peterse	2017-10-17	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent creating multiple ApplicationSetting by forcing it to always have id=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718