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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 9.5.9v9.5.9	Jarka Kadlecova	2017-10-16	1	-1/+1
\|
*	Update CHANGELOG.md for 9.5.9	Jarka Kadlecova	2017-10-16	6	-24/+8
\| \| \|	[ci skip]
*	Merge branch '3435-backport-9-5' into 'security-9-5'	Stan Hu	2017-10-14	4	-23/+2
\|\ \| \| \| \| \| \| \| \|	3435 backport for 9.5 See merge request gitlab/gitlabhq!2207
\| *	Merge branch 'security-9-5' into 3435-backport-9-5	Stan Hu	2017-10-14	1	-1/+13
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'acey-flakes' into 'master'	Rémy Coutable	2017-10-14	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \|	fix transient user_edits_files_spec failures See merge request gitlab-org/gitlab-ce!14324
\| *	Merge remote-tracking branch 'origin/security-9-5' into 3435-backport-9-5	Stan Hu	2017-10-14	144	-707/+2015
\| \|\ \| \|/ \|/\|
* \|	Fix conflicts in Gemfile.lock	Brian Neel	2017-10-14	144	-707/+2015
\|\ \
\| * \|	Merge branch '38126-security-username-change-9-5' into 'security-9-5'	Douwe Maan	2017-10-12	4	-12/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move project repositories between namespaces when renaming users (9.5) See merge request gitlab/gitlabhq!2202
\| * \|	Merge branch 'winh-search-bar-xss-9.5' into 'security-9-5'	Phil Hughes	2017-10-12	3	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape user name in filtered search bar See merge request gitlab/gitlabhq!2195
\| * \|	Merge branch 'rs-sanitize-unicode-in-protocol-9-5' into 'security-9-5'	Douwe Maan	2017-10-12	3	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[9.5] Prevent a persistent XSS in user-provided markup See merge request gitlab/gitlabhq!2203
\| * \|	Merge branch '37759-also-treat-newlines-as-separator' into 'master'	Kamil Trzciński	2017-10-12	3	-14/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Treat newlines as separators for pipeline emails service Closes #37759 See merge request gitlab-org/gitlab-ce!14250
\| * \|	Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'	Robert Speicher	2017-10-12	3	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix arbitrary redirect location vulnerability See merge request gitlab/gitlabhq!2192
\| * \|	Update VERSION to 9.5.8v9.5.8	Jose Ivan Vargas	2017-10-04	1	-1/+1
\| \| \|
\| * \|	Update CHANGELOG.md for 9.5.8	Jose Ivan Vargas	2017-10-04	2	-5/+4
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'fork-btn-enabled-user-groups' into 'master'	Filipa Lacerda	2017-10-04	12	-24/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fork button being disabled for users who can fork to group Closes #38462 See merge request gitlab-org/gitlab-ce!14551
\| * \|	Update VERSION to 9.5.7v9.5.7	Jose Ivan Vargas	2017-10-03	1	-1/+1
\| \| \|
\| * \|	Update CHANGELOG.md for 9.5.7	Jose Ivan Vargas	2017-10-03	2	-4/+4
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'sh-import-repos-fix-9-5' into '9-5-stable'	Robert Speicher	2017-10-03	5	-1/+28
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab rake:import:repos task for 9.5.x See merge request gitlab-org/gitlab-ce!14639
\| \| * \|	Fix gitlab rake:import:repos tasksh-import-repos-fix-9-5	Stan Hu	2017-10-02	5	-1/+28
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports !14597 for the 9.5.x branch. Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682
\| * \|	Update VERSION to 9.5.6v9.5.6 9-5-stable-patch-7	Jose Ivan Vargas	2017-09-29	1	-1/+1
\| \| \|
\| * \|	Update CHANGELOG.md for 9.5.6	Jose Ivan Vargas	2017-09-29	5	-21/+7
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch '38319-9-5-stable' into '9-5-stable-patch-6'9-5-stable-patch-6	Jose Ivan Vargas Lopez	2017-09-28	5	-6/+88
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle error when fetching ref for MR with deleted source branch See merge request gitlab-org/gitlab-ce!14550
\| \| * \|	Handle error when fetching ref for MR with deleted source branch38319-9-5-stable	Sean McGivern	2017-09-28	5	-6/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour.
\| * \| \|	Merge branch 'winh-upgrade-nokogiri' into 'master'	Robert Speicher	2017-09-28	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Nokogiri because of CVE-2017-9050 See merge request gitlab-org/gitlab-ce!14427
\| * \| \|	Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'	Annabel Dunstone Gray	2017-09-28	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
\| * \| \|	Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'	Fatih Acet	2017-09-28	10	-25/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
\| * \| \|	Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'	Fatih Acet	2017-09-28	4	-3/+16
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
\| * \|	Update VERSION to 9.5.5v9.5.5	Simon Knox	2017-09-18	1	-1/+1
\| \| \|
\| * \|	Update CHANGELOG.md for 9.5.5	Simon Knox	2017-09-18	17	-84/+19
\| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch ↵9-5-stable-patch-5	Grzegorz Bizon	2017-09-15	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
\| * \|	Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master'	Rémy Coutable	2017-09-15	2	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: GPG tmp dir removal race condition Ignore any errors when removing the tmp directory, as we may run into a race condition: The `gpg-agent` agent process may clean up some files as well while `FileUtils.remove_entry` is iterating the directory and removing all its contained files and directories recursively, which could raise an error. Closes #36998 See merge request !14194
\| * \|	Merge branch '9-5-stable' into '9-5-stable-patch-5'	Simon Knox	2017-09-16	7	-6/+67
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \	Merge branch 'issue_37640_9_5_stable' into '9-5-stable'	Grzegorz Bizon	2017-09-15	7	-6/+67
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project feature being deleted when updating project with invalid visibility level See merge request gitlab-org/gitlab-ce!14235
\| \| \| * \|	Fix migrationsissue_37640_9_5_stable	Felipe Artur	2017-09-14	3	-17/+6
\| \| \| \| \|
\| \| \| * \|	Add migration to fix corrupted projects	Felipe Artur	2017-09-14	4	-3/+47
\| \| \| \| \|
\| \| \| * \|	Fix project feature being deleted when updating project with invalid ↵	Felipe Artur	2017-09-12	5	-5/+33
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	visibility level
\| * \| \|	Merge branch ↵	Kamil Trzciński	2017-09-13	3	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244
\| * \| \|	Merge branch '9-5-stable-patch-5-1' into '9-5-stable-patch-5'	Simon Knox	2017-09-12	21	-161/+216
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick for 9.5: "Refactor how we fetch ref for merge requests" See merge request !14213
\| \| * \| \|	Merge branch '36089-handle-ref-failure-better' into 'master'9-5-stable-patch-5-1	Douwe Maan	2017-09-12	21	-161/+216
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
\| * \| \|	remove tests that should have been reverted	Simon Knox	2017-09-12	1	-18/+0
\| \| \| \|
\| * \| \|	fix docs-list task - update docs in previous location	Simon Knox	2017-09-12	3	-248/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	alternative is to pick !13872
\| * \| \|	change committer back to user for spec	Simon Knox	2017-09-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13984/
\| * \| \|	Merge branch '35804-document-table-based-tests' into 'master'	Robert Speicher	2017-09-11	4	-0/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
\| * \| \|	Revert "Merge branch 'sidebar-cache-updates' into 'master'"	Jose Ivan Vargas	2017-09-11	5	-56/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit dd406182cb3529c3616097703b7d4dec49a3cb39, reversing changes made to d5d249764350b07340ed45068361d7249b3cf641.
\| * \| \|	Merge branch 'feature/gpg-verification-status' into 'master'	Douwe Maan	2017-09-08	40	-282/+863
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GPG signature must match the committer in order to be verified See merge request !13771
\| * \| \|	Merge branch 'perf.slow-issuable' into 'master'	Sean McGivern	2017-09-08	3	-19/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perf.slow issuable Closes #32844 See merge request !13685
\| * \| \|	Merge branch 'sidebar-cache-updates' into 'master'	Sean McGivern	2017-09-08	5	-0/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only update the sidebar count caches when needed See merge request !13878
\| * \| \|	Merge branch 'check-trigger-permissions-mysql' into 'master'	Douwe Maan	2017-09-08	6	-8/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve migrations using triggers Closes #36633 See merge request !13666
\| * \| \|	Merge branch 'new-sidebar-scss-fix' into '9-5-stable-patch-5'	Tim Zallmann	2017-09-08	1	-3/+16
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new_sidebar.scss being out of date See merge request !14035
\| \| * \| \|	Fix new_sidebar.scss being out of datenew-sidebar-scss-fix	Phil Hughes	2017-09-04	1	-6/+18
\| \| \| \| \|