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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixed up copy button click methodmulti-file-blob-viewer	Phil Hughes	2017-11-21	2	-8/+19
\| \| \| \|	moved classes to computed props
*	fixed karma specs	Phil Hughes	2017-11-21	2	-12/+3
\|
*	fixed up some JS based on comments	Phil Hughes	2017-11-21	18	-33/+415
\| \| \| \|	added feature spec
*	fixed karma specs	Phil Hughes	2017-11-21	3	-1/+3
\|
*	correctly conditionally load expanded blob	Phil Hughes	2017-11-21	4	-11/+15
\|
*	match functionality to current blob viewer	Phil Hughes	2017-11-21	16	-79/+309
\| \| \| \| \|	some blob viewers aren't working yet, these will be tackled in another merge request
*	fixed rubocop	Phil Hughes	2017-11-21	5	-5/+9
\|
*	ruby specs	Phil Hughes	2017-11-21	12	-17/+176
\| \| \| \|	fixed up karma specs
*	fixed karma specs	Phil Hughes	2017-11-21	14	-38/+186
\| \| \| \| \|	fixed upload spec added explanation when binary file can not be editted
*	change check inside of render locally getter	Phil Hughes	2017-11-21	1	-11/+14
\|
*	async load in the blob viewer components	Phil Hughes	2017-11-21	3	-20/+48
\| \| \| \|	made the support for multiple viewers a little easier
*	added local error preview state	Phil Hughes	2017-11-21	11	-56/+165
\|
*	fixed parent tree URL being incorrect on frontend	Phil Hughes	2017-11-21	1	-1/+1
\|
*	reduced complexity by always fetching from server	Phil Hughes	2017-11-21	8	-152/+5
\| \| \| \|	will handle different viewers in different merge requests
*	added some frontend blob viewers	Phil Hughes	2017-11-21	16	-96/+275
\| \| \| \|	[ci skip]
*	fixed failing karma specs	Phil Hughes	2017-11-21	7	-24/+416
\| \| \| \|	added specs for new mutations, actions and getters
*	fixed styling	Phil Hughes	2017-11-21	4	-5/+6
\|
*	added blob viewer switcher	Phil Hughes	2017-11-21	9	-15/+241
\|
*	Fix BlobBasicEntity when used to render a tree blob	Douwe Maan	2017-11-21	2	-4/+6
\|
*	Move blob JSON to entity and expose blob viewer JSON	Douwe Maan	2017-11-21	11	-53/+97
\|
*	Merge branch '38869-milestone' into 'master'	Phil Hughes	2017-11-21	10	-209/+176
\|\ \| \| \| \| \| \| \| \|	Export code as ES6 modules See merge request gitlab-org/gitlab-ce!15503
\| *	Export code as ES6 modules38869-milestone	Filipa Lacerda	2017-11-20	10	-209/+176
\| \|
* \|	Merge branch 'backport-3434' into 'master'	Filipa Lacerda	2017-11-21	6	-3/+72
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport ability to enable/disable file attachments in issuable form See merge request gitlab-org/gitlab-ce!15433
\| * \|	Backport ability to enable/disable file attachments in issuable form	Clement Ho	2017-11-21	6	-3/+72
\|/ /
* \|	Merge branch 'sh-memoize-gitlab-shell' into 'master'	Douwe Maan	2017-11-21	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Memoize GitlabShellAdapter for performance and ease of testing See merge request gitlab-org/gitlab-ce!15507
\| * \|	Memoize GitlabShellAdapter for performance and ease of testing	Stan Hu	2017-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3463#note_47990536
* \| \|	Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'	Phil Hughes	2017-11-21	3	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commits list 500 with multi-file editor new_repo cookie Closes #39821 See merge request gitlab-org/gitlab-ce!15502
\| * \| \|	Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editor	Eric Eastwood	2017-11-20	3	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821 /<namespace>/<project>/commmits/master
* \| \| \|	Merge branch 'rc/remove-useless-allow-failure' into 'master'	Grzegorz Bizon	2017-11-21	1	-2/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove a useless `allow_failure: no` and use `true` instead of `yes` See merge request gitlab-org/gitlab-ce!15491
\| * \| \|	Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failure	Rémy Coutable	2017-11-20	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'grpc-update' into 'master'	Robert Speicher	2017-11-21	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439
\| * \| \|	Update gRPC to v1.7.2	Alejandro Rodríguez	2017-11-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This solves a problem where Gitaly connections through Unix sockets would not work when a proxy was configures, even if a no_proxy setting was specified
* \| \| \|	Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'	Nick Thomas	2017-11-20	2	-47/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove the rake task `gitlab:sidekiq:drop_post_receive` Closes #40290 See merge request gitlab-org/gitlab-ce!15493
\| * \| \| \|	added changelog entry40290-remove-rake-gitlab-sidekiq-drop-post-receive	digitalMoksha	2017-11-20	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	remove the rake task `gitlab:sidekiq:drop_post_receive`	digitalMoksha	2017-11-20	1	-47/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This task is no longer being used and is not documented.
* \| \| \| \|	Merge branch 'fix-mr-cleanup' into 'master'	Sean McGivern	2017-11-20	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix merge_requests.source_project_id migration See merge request gitlab-org/gitlab-ce!15496
\| * \| \| \| \|	Fix merge_requests.source_project_id migrationfix-mr-cleanup	Yorick Peterse	2017-11-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to make sure merge_requests.source_project_id allows NULL values _before_ updating rows as otherwise this will lead to a NOT NULL constraint failing.
* \| \| \| \| \|	Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'	Sean McGivern	2017-11-20	4	-4/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Impersonation no longer gets stuck on password change. Closes #13888 See merge request gitlab-org/gitlab-ce!15497
\| * \| \| \| \| \|	Fix MR IID in changelog item1870-impersonation-stuck-on-password-change-ce	Douwe Maan	2017-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Impersonation no longer gets stuck on password change.	Tiago Botelho	2017-11-20	4	-4/+34
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '39497-inline-edit-issue-on-mobile' into 'master'	Annabel Dunstone Gray	2017-11-20	7	-79/+105
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add inline editing to issues on mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438
\| * \| \| \| \| \|	Add inline editing to issues on mobile	Eric Eastwood	2017-11-18	7	-79/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497
* \| \| \| \| \| \|	Merge branch '4080-align-retry-btn' into 'master'	Annabel Dunstone Gray	2017-11-20	3	-1/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align retry button with job title with new grid size Closes #40342 See merge request gitlab-org/gitlab-ce!15462
\| * \| \| \| \| \| \|	Align retry button with job title with new grid size	Filipa Lacerda	2017-11-20	3	-1/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '40292-bitbucket-import-hashed-storage' into 'master'	Douwe Maan	2017-11-20	3	-5/+37
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bitbucket wiki import with hashed storage enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490
\| * \| \| \| \| \| \|	Fix bitbucket wiki import with hashed storage enabled	Nick Thomas	2017-11-20	3	-5/+37
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'req-docs' into 'master'	Rémy Coutable	2017-11-20	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve requirements details See merge request gitlab-org/gitlab-ce!15265
\| * \| \| \| \| \| \|	formatting cleanup, swamp details, unicorn defaults	Ben Bodenmiller	2017-11-07	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-protected-branches-descriptions' into 'master'	Douwe Maan	2017-11-20	3	-4/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify wording of protected branch settings for the default branch See merge request gitlab-org/gitlab-ce!15492
\| * \| \| \| \| \| \|	Clarify wording of protected branch settings for the default branch	Sean McGivern	2017-11-20	3	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No-one is allowed to force push to a protected branch, or delete it. That's correct in the documentation, but was wrong in the drop-down.