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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix binary files not showing anything in edit modemulti-file-editor-binary-editor	Phil Hughes	2017-11-01	2	-6/+20
\|
*	Merge branch 'lazy-load-check-when-has-images' into 'master'	Filipa Lacerda	2017-11-01	1	-8/+7
\|\ \| \| \| \| \| \| \| \|	Increase lazy loader performance See merge request gitlab-org/gitlab-ce!15114
\| *	Increase lazy loader performancelazy-load-check-when-has-images	Phil Hughes	2017-10-31	1	-8/+7
\| \| \| \| \| \| \| \|	This stops the checkElementsInView method from running when there aren't any lazy load images on the page. By calling this method we are causing an unnecessary reflow which on large pages is a massive performance issue
* \|	Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master'	Sean McGivern	2017-11-01	6	-33/+157
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#file to Gitaly Closes gitaly#689 See merge request gitlab-org/gitlab-ce!15014
\| * \|	Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitaly	Ahmad Sherif	2017-10-31	6	-33/+157
\| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#689
* \| \|	Merge branch 'rc-qa-mattermost-login' into 'master'	Grzegorz Bizon	2017-11-01	7	-0/+107
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add login mattermost to Test::Integration::Mattermost See merge request gitlab-org/gitlab-ce!15033
\| * \| \|	Add tests for mattermost login via oauth	Richard Clamp	2017-10-30	6	-0/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Adds Runtime::Scenario as a place to record the properties of the Scenario we're interested in. * Adds a positional argument to Test::Integration::Mattermost to specify Runtime::Scenario.mattermost * Adds Page::Mattermost::{Main,Login} to model the mattermost pages we need to interact with. * Adds qa/features/mattermost/login_spec to perform a login via oauth and ensure we are logged in.
\| * \| \|	Add spec for QA::Scenario::Entrypoint	Richard Clamp	2017-10-25	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For added confidence, and because I plan to fiddle with some behaviours shortly, add spec testing to the newly extracted QA::Scenario::Entrypoint class.
* \| \| \|	Merge branch 'go-get-ssh' into 'master'	Douwe Maan	2017-11-01	3	-55/+103
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Returns a SSH url for go-get=1 Closes #38858 See merge request gitlab-org/gitlab-ce!14990
\| * \| \| \|	Returns a ssh url for go-get=1	Guilherme Vieira	2017-10-31	3	-55/+103
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Phil Hughes	2017-11-01	7	-1164/+8
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39633-convert-fuzzaldrin-plus-js-library-to-be-a-yarn-managed-library' into 'master' Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library" Closes #39633 See merge request gitlab-org/gitlab-ce!15097
\| * \| \| \|	Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"	Tim Zallmann	2017-11-01	7	-1164/+8
\|/ / / /
* \| \| \|	Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'	Sean McGivern	2017-10-31	4	-25/+110
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Wiki#page to Gitaly Closes gitaly#677 See merge request gitlab-org/gitlab-ce!14955
\| * \| \| \|	Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitaly	Ahmad Sherif	2017-10-31	4	-25/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#677
* \| \| \| \|	Merge branch 'dm-ldap-identity-normalize-dn' into 'master'	Sean McGivern	2017-10-31	9	-12/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103
\| * \| \| \| \|	Normalize LDAP DN when looking up identity	Douwe Maan	2017-10-31	9	-12/+35
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'	Rémy Coutable	2017-10-31	3	-3/+8
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump carrierwave to 1.2.1 Closes #39580 See merge request gitlab-org/gitlab-ce!15072
\| * \| \| \| \|	Bump carrierwave to 1.2.1	Takuya Noguchi	2017-10-30	3	-3/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'multi-file-editor-vuex' into 'master'	Filipa Lacerda	2017-10-31	63	-2447/+1826
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move multi-file editor store to Vuex See merge request gitlab-org/gitlab-ce!15046
\| * \| \| \| \| \|	fixed up upload feature after master mergemulti-file-editor-vuex	Phil Hughes	2017-10-31	7	-46/+64
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into multi-file-editor-vuex	Phil Hughes	2017-10-31	21	-264/+283
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	get branch name from the DOM	Phil Hughes	2017-10-31	2	-2/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into multi-file-editor-vuex	Phil Hughes	2017-10-31	66	-750/+695
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2017-10-31	3	-2/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2017-10-30	7	-13/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	increased perf of scrolling tabs into view
\| * \| \| \| \| \| \| \|	addressed feedback from review	Phil Hughes	2017-10-30	19	-74/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec fixes
\| * \| \| \| \| \| \| \|	Merge branch 'master' into multi-file-editor-vuex	Phil Hughes	2017-10-30	132	-524/+2018
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	updated karma specs	Phil Hughes	2017-10-27	27	-1030/+612
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	reset hash when changing files	Phil Hughes	2017-10-26	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	various different performance improvements	Phil Hughes	2017-10-26	10	-37/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	fixed render_error not being hooked up correctly	Phil Hughes	2017-10-26	5	-34/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	fixed some state bugs with the tabs	Phil Hughes	2017-10-26	10	-38/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	correctly activate the next tab when closing a tab	Phil Hughes	2017-10-26	3	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scroll to the active tab when opening/closing [ci skip]
\| * \| \| \| \| \| \| \| \|	moved new file/directory into new store	Phil Hughes	2017-10-26	19	-692/+176
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed old store, helper & monaco loader moved monaco loader into editor component because it is the only component that requires monaco [ci skip]
\| * \| \| \| \| \| \| \| \|	[WIP] Move multi-file editor store to Vuex	Phil Hughes	2017-10-26	33	-584/+910
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master'	Sean McGivern	2017-10-31	4	-6/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Ruby to 2.3.5 See merge request gitlab-org/gitlab-ce!15099
\| * \| \| \| \| \| \| \| \|	Be able to bundle gems with newer rubieszj/gitlab-ce-zj-ruby-2.3.5	Zeger-Jan van de Weg	2017-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Upgrade Ruby to 2.3.5	Zeger-Jan van de Weg	2017-10-31	4	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of gitlab-org/gitlab-ce#38040
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/improve-maintenance' into 'master'	Stan Hu	2017-10-31	1	-13/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the maintenance policy page See merge request gitlab-org/gitlab-ce!15112
\| * \| \| \| \| \| \| \| \| \|	Improve the maintenance policy page	Rémy Coutable	2017-10-31	1	-13/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make clear that we may backport bug fixes to the previous stable release. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch '23206-load-participants-async' into 'master'	Phil Hughes	2017-10-31	45	-205/+911
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load participants async Closes #23206 See merge request gitlab-org/gitlab-ce!14836
\| * \| \| \| \| \| \| \| \| \| \|	Load participants async	Eric Eastwood	2017-10-31	45	-205/+911
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/import-issue-assignees' into 'master'	Sean McGivern	2017-10-31	7	-1/+27
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109
\| * \| \| \| \| \| \| \| \| \|	add changelog	James Lopez	2017-10-31	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix spec failure	James Lopez	2017-10-31	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix specsfix/import-issue-assignees	James Lopez	2017-10-31	3	-7/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix missing issue assignees	James Lopez	2017-10-31	4	-1/+16
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master'	Annabel Dunstone Gray	2017-10-31	2	-5/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix overlap of right-sidebar and wiki create page form Closes #39509 See merge request gitlab-org/gitlab-ce!15075
\| * \| \| \| \| \| \| \| \| \|	Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlap	Eric Eastwood	2017-10-31	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39509
* \| \| \| \| \| \| \| \| \| \|	Merge branch '31454-missing-project-id-pipeline-hook-data' into 'master'	Rémy Coutable	2017-10-31	3	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds project_id to pipeline hook data Closes #31454 See merge request gitlab-org/gitlab-ce!15044