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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.1.0-rc2v10.1.0-rc2	Lin Jen-Shin	2017-10-17	1	-1/+1
\|
*	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
\| *	Those tests were tested under authenticated	Lin Jen-Shin	2017-10-16	1	-21/+21
\| \| \| \| \| \| \| \|	On master, so we should move them under authenticated.
\| *	Fix bad merge with spec/models/namespace_spec.rb	Stan Hu	2017-10-15	1	-1/+1
\| \|
\| *	Merge branch 'port-ee-3435' into 'security-10-0'	Robert Speicher	2017-10-15	4	-30/+10
\| \| \| \| \| \| \| \| \| \| \| \|	[10.0 CE] Prevent "Related Issues" from leaking confidential issues See merge request gitlab/gitlabhq!2193
\| *	Merge branch '38126-security-username-change' into 'security-10-0'	Douwe Maan	2017-10-15	4	-16/+49
\| \| \| \| \| \| \| \| \| \| \| \|	Move project repositories between namespaces when renaming users (10.0) See merge request gitlab/gitlabhq!2200
\| *	Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'	Douwe Maan	2017-10-15	3	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \|	[10.0] Prevent a persistent XSS in user-provided markup See merge request gitlab/gitlabhq!2199
\| *	Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'	Robert Speicher	2017-10-15	3	-10/+15
\| \| \| \| \| \| \| \| \| \|	Fix arbitrary redirect location vulnerability See merge request gitlab/gitlabhq!2192
\| *	Merge branch 'winh-search-bar-xss' into 'security-10-0'	Phil Hughes	2017-10-15	2	-2/+25
\| \| \| \| \| \| \| \| \| \|	Escape user name in filtered search bar See merge request gitlab/gitlabhq!2194
* \|	Update VERSION to 10.1.0-rc1v10.1.0-rc1	Lin Jen-Shin	2017-10-16	1	-1/+1
\| \|
* \|	Merge branch '10-1-stable-prepare-rc1' into '10-1-stable'	Lin Jen-Shin (godfat)	2017-10-16	98	-623/+1352
\|\ \ \| \|/ \| \| \| \| \| \|	Prepare 10.1 RC1 release See merge request gitlab-org/gitlab-ce!14847
\| *	Merge branch '39001-mr-tabs-hover' into 'master'10-1-stable-prepare-rc1	Phil Hughes	2017-10-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes from CSS refactor Closes #39001 and #38939 See merge request gitlab-org/gitlab-ce!14828
\| *	Merge branch 'cache-issuable-template-names' into 'master'	Douwe Maan	2017-10-13	7	-28/+54
\| \| \| \| \| \| \| \| \| \|	Cache issuable template names See merge request gitlab-org/gitlab-ce!14823
\| *	Merge branch 'docs-patch-28' into 'master'	Achilleas Pipinellis	2017-10-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	Update image commenting MR link in docs See merge request gitlab-org/gitlab-ce!14816
\| *	Merge branch 'fix-cursor-path' into 'master'	Tim Zallmann	2017-10-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use image-url instead of url so that asset pipeline can do it's thing Closes #38980 See merge request gitlab-org/gitlab-ce!14799
\| *	Merge branch 'milestones-permissions-docs' into 'master'	Sean McGivern	2017-10-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	Developer can create/edit/delete milestones See merge request gitlab-org/gitlab-ce!14797
\| *	Merge branch 'add-resolve-discussion-test' into 'master'	Filipa Lacerda	2017-10-13	1	-5/+15
\| \| \| \| \| \| \| \| \| \|	Add explicit test to test resolved discussion toggle content See merge request gitlab-org/gitlab-ce!14796
\| *	Merge branch '38941-lock-note-fix' into 'master'	Sean McGivern	2017-10-13	3	-3/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix text for the merge request lock system note Closes #38941 See merge request gitlab-org/gitlab-ce!14779
\| *	Merge branch ↵	Tim Zallmann	2017-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38574-superfluous-export-in-advanced-settings-of-project-settings' into 'master' Resolve "Superfluous "Export" in "Advanced settings" of project settings" Closes #38574 See merge request gitlab-org/gitlab-ce!14773
\| *	Merge branch 'wiki-empty-page-heading' into 'master'	Filipa Lacerda	2017-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wiki empty page translation namespace not being removed Closes #38920 See merge request gitlab-org/gitlab-ce!14759
\| *	Merge branch 'docs-image-discussion' into 'master'	Achilleas Pipinellis	2017-10-13	6	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add image discussion docs Closes #38879 See merge request gitlab-org/gitlab-ce!14743
\| *	Merge branch 'lock-discussion-docs' into 'master'	Clement Ho	2017-10-13	2	-24/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Locked issues / mrs docs Closes #38880 See merge request gitlab-org/gitlab-ce!14770
\| *	Merge branch 'backport-ee-2869' into 'master'	Sean McGivern	2017-10-13	3	-16/+34
\| \| \| \| \| \| \| \| \| \|	backport for gitlab-ee!2869 See merge request gitlab-org/gitlab-ce!14505
\| *	Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'	Douwe Maan	2017-10-13	15	-18/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
\| *	Merge branch '37691-subscription-fires-multiple-notifications' into 'master'	Sean McGivern	2017-10-13	4	-8/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix multiple notifications from being sent for multiple labels Closes #37691 See merge request gitlab-org/gitlab-ce!14798
\| *	Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'	Sean McGivern	2017-10-13	5	-2/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make "merge ongoing" check more consistent Closes #39032 See merge request gitlab-org/gitlab-ce!14825
\| *	Merge branch 'update-licenses.csv' into 'master'	Rémy Coutable	2017-10-13	1	-102/+52
\| \| \| \| \| \| \| \| \| \|	Update dependencies license list See merge request gitlab-org/gitlab-ce!14845
\| *	Merge branch '39028-repo-by-url-fields' into 'master'	Tim Zallmann	2017-10-13	3	-50/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project fields to import project by url Closes #39028 See merge request gitlab-org/gitlab-ce!14822
\| *	Merge branch '37399-simplify-project-page' into 'master'	Phil Hughes	2017-10-13	18	-187/+313
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify project page Closes #37399 and #38839 See merge request gitlab-org/gitlab-ce!14669
\| *	Merge branch '35580-cannot-import-project-with-milestones' into 'master'	Sean McGivern	2017-10-12	6	-98/+333
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix the import :milestone from adding the group_id Closes #35580 See merge request gitlab-org/gitlab-ce!14657
\| *	Merge branch 'docs/gke-cluster' into 'master'	Achilleas Pipinellis	2017-10-12	4	-59/+172
\| \| \| \| \| \| \| \| \| \|	Add docs for GKE integration See merge request gitlab-org/gitlab-ce!14712
\| *	Merge branch 'update-installation-doc-for-10-1' into 'master'	Rémy Coutable	2017-10-12	2	-6/+6
\| \| \| \| \| \| \| \| \| \|	Update installation doc for 10.1 See merge request gitlab-org/gitlab-ce!14843
\| *	Merge branch 'update-templates' into 'master'	Rémy Coutable	2017-10-12	19	-21/+85
\|/ \| \| \| \|	Update templates See merge request gitlab-org/gitlab-ce!14844
*	Merge branch 'fix-dropdown' into 'master'	Annabel Dunstone Gray	2017-10-11	2	-2/+3
\| \| \| \| \| \| \|	Remove not selector increasing specificity of rules Closes #38958 See merge request gitlab-org/gitlab-ce!14789
*	Merge branch 'fix-resolved-discussion' into 'master'	Filipa Lacerda	2017-10-11	4	-10/+6
\| \| \| \| \| \| \|	Fix unable to expand text diff discussion comments Closes #38940 See merge request gitlab-org/gitlab-ce!14792
*	Merge branch ↵	Kamil Trzciński	2017-10-11	2	-4/+5
\| \| \| \| \| \| \| \| \|	'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master' Move callback route(`google_api/auth/callback`) for Oauth under `-` Closes #38911 See merge request gitlab-org/gitlab-ce!14802
*	Merge branch 'rs-mysql-groups-dashboard-failure' into 'master'	Douwe Maan	2017-10-11	1	-10/+10
\| \| \| \| \| \| \|	Fix a feature spec failing only on MySQL Closes #39003 See merge request gitlab-org/gitlab-ce!14811
*	Merge branch '38534-minigraph' into 'master'	Phil Hughes	2017-10-09	3	-4/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes mini graph in commit view Closes #38534 See merge request gitlab-org/gitlab-ce!14758
\| *	Fixes mini graph in commit view38534-minigraph	Filipa Lacerda	2017-10-09	3	-4/+14
\| \|
* \|	Merge branch 'jk-assignees-todos-fix' into 'master'	Sean McGivern	2017-10-09	3	-5/+30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport of "Don't create todos for old issue assignees" See merge request gitlab-org/gitlab-ce!14765
\| * \|	Don't create todos for old issue assignees	Jarka Kadlecova	2017-10-09	3	-5/+30
\| \| \|
* \| \|	Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵	Sean McGivern	2017-10-09	4	-234/+390
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Don't show an "Unsubscribe" link in snippet comment notifications Closes #23888 See merge request gitlab-org/gitlab-ce!14764
\| * \| \|	Don't show an "Unsubscribe" link in snippet comment notifications	Rémy Coutable	2017-10-09	4	-234/+390
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'rs-qa-sandbox-group' into 'master'	Grzegorz Bizon	2017-10-09	8	-14/+138
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make use of a `gitlab-qa-sandbox` group if available See merge request gitlab-org/gitlab-ce!14682
\| * \| \|	Add QA::Scenario::Gitlab::Group::Create	Robert Speicher	2017-10-09	7	-59/+87
\| \| \| \|
\| * \| \|	Add QA::Page::Group::New to fill in the "Create group" formrs-qa-sandbox-group	Robert Speicher	2017-10-06	3	-13/+28
\| \| \| \|
\| * \| \|	Clean up QA::Page::Dashboard::Groups a bit	Robert Speicher	2017-10-06	1	-11/+16
\| \| \| \|
\| * \| \|	Use autoloading instead of an explicit require	Robert Speicher	2017-10-06	2	-1/+4
\| \| \| \|
\| * \| \|	Implement Scenario::Gitlab::Sandbox::Prepare	Robert Speicher	2017-10-05	4	-34/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This better separates the concerns of preparing the sandbox namespace from creating a (sub)group.
\| * \| \|	Make use of a `gitlab-qa-sandbox` group if available	Robert Speicher	2017-10-04	3	-7/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will use a top-level group if it's available, or create one if it's not, then create our `qa_test_*` groups as subgroups of the sandbox group.