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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.1.0v10.1.0	Stan Hu	2017-10-21	1	-1/+1
\|
*	Update CHANGELOG.md for 10.1.0	Stan Hu	2017-10-21	190	-947/+192
\| \| \|	[ci skip]
*	Update VERSION to 10.1.0-rc4v10.1.0-rc4	Winnie Hellmann	2017-10-21	1	-1/+1
\|
*	Merge branch '39189-online-view-of-html-artifacts-is-broken' into 'master'	Grzegorz Bizon	2017-10-21	3	-10/+19
\| \| \| \| \| \| \| \| \| \| \|	Resolve "Online view of HTML artifacts is broken?" Closes #39189 See merge request gitlab-org/gitlab-ce!14977 (cherry picked from commit cfd97f7ebedec56ccf979e21997dfa19e0807205) 3c0be3cd Fix the external URLs generated for online view of HTML artifacts
*	Merge branch 'fix-application-setting-nil-cache' into 'master'	Winnie Hellmann	2017-10-20	4	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \|	Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952 (cherry picked from commit 81175d2c37d7bb9768ee21b13207ef57d11ad3ea) 64fd9814 Prevent ApplicationSetting to cache nil value beeed14f Fix failure in current_settings_spec.rb
*	Merge branch '10-1-stable-prepare-rc4' into '10-1-stable'	Winnie Hellmann	2017-10-20	11	-19/+61
\|\ \| \| \| \| \| \| \| \|	Prepare 10.1 RC4 release See merge request gitlab-org/gitlab-ce!14953
\| *	Merge branch 'fix-non-diff-resolved-discussion' into 'master'	Phil Hughes	2017-10-20	3	-7/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force non diff resolved discussion to display when collapse toggled Closes #39187 See merge request gitlab-org/gitlab-ce!14946 (cherry picked from commit 9c3f094a2f7609386ed182e4d5f6f9e7f6938388) 9487cadf Force non diff resolved discussion to display when collapse toggled 1c4f42a4 Add spec f6304f16 Add changelog
\| *	Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵10-1-stable-prepare-rc4	Stan Hu	2017-10-19	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update Prometheus gem to fix problems with other Processes overwriting current metrics file Closes #36714 See merge request gitlab-org/gitlab-ce!14827 (cherry picked from commit f73efb793233f69a0402ba529410bf52c6105c2c) f9a4f184 Update Prometheus gem to fix problems with other files overwriting current file
\| *	Merge branch 'sh-fix-broken-docker-delete' into 'master'	Grzegorz Bizon	2017-10-19	4	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inability to delete container registry tags Closes #39260 See merge request gitlab-org/gitlab-ce!14947 (cherry picked from commit 83f5955ee342af01cea7a9a2e18089a3de615a06) b7e35033 Fix inability to delete container registry tags de57492d Fix broken function invocation
\| *	Merge branch 'encoding-helper-performance' into 'master'	Rémy Coutable	2017-10-19	2	-4/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoind unnecesary `force_encoding` operations Closes #39227 See merge request gitlab-org/gitlab-ce!12167 (cherry picked from commit 371eb62bc90a70f4a578303215e1d4dfc430ddbb) 520866a0 Avoind unnecesary `force_encoding` operations
* \|	Merge branch 'tc-page-title-encoding-fix' into 'master'	Winnie Hellmann	2017-10-20	3	-2/+16
\|/ \| \| \| \| \| \| \| \| \|	URI decode Page-Title header to preserve UTF-8 characters Closes #39179 (cherry-picked from 85c201603ab856fbe5129aa231ab069ffd73d769) See merge request gitlab-org/gitlab-ce!14929
*	Update VERSION to 10.1.0-rc3v10.1.0-rc3	Winnie Hellmann	2017-10-19	1	-1/+1
\|
*	Merge branch '10-1-stable-prepare-rc3' into '10-1-stable'	Winnie Hellmann	2017-10-18	54	-67/+450
\|\ \| \| \| \| \| \| \| \|	Prepare 10.1 RC3 release See merge request gitlab-org/gitlab-ce!14921
\| *	Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' ↵	Rémy Coutable	2017-10-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Jobs fail because of Brazilian Portuguese translations" Closes #39253 See merge request gitlab-org/gitlab-ce!14939 (cherry picked from commit 9c71fb0de2f0a7482b1a59c673142981ecdab26f) 0139b318 Prevent ApplicationHelper specs from polluting later ones
\| *	Merge branch 'pms-fix-tooltip-padding' into 'master'	Annabel Dunstone Gray	2017-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tooltip padding to align to 8px grid See merge request gitlab-org/gitlab-ce!14928 (cherry picked from commit fee7a879e2f3b1347da75eb64c4f5a24fea2625f) fca91e61 Fix tooltip padding to align to 8px grid
\| *	Merge branch 'bvl-fix-locale-path' into 'master'10-1-stable-prepare-rc3	Tim Zallmann	2017-10-18	4	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924 (cherry picked from commit 4733570c3d710f3124718fa1173f3068eb932281) 939469cd Build the locale path with an `_` instead of a `-`
\| *	Merge branch 'fix-resolved-side-by-side' into 'master'	Phil Hughes	2017-10-18	3	-7/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix resolved discussions not expanding on side by side view Closes #39209 See merge request gitlab-org/gitlab-ce!14918 (cherry picked from commit acadf527117d759b6b8ca27245a8d85d01f77bc2) f8cf00fd Fix resolved discussions not expanding on side by side view 07c81f23 Add specs 3581c6db Improve spec
\| *	Merge branch '39201-improve-google-image' into 'master'	Phil Hughes	2017-10-18	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace google login image Closes #39201 See merge request gitlab-org/gitlab-ce!14919 (cherry picked from commit 1d72952dc340024cba9bba94d87e871e043164f9) 5df66e6b Replace google login image
\| *	Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ↵	Douwe Maan	2017-10-18	2	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "GitlabUsagePingWorker is not running on GitLab.com" See merge request gitlab-org/gitlab-ce!14867 (cherry picked from commit 07e330896755b5a84f92042e7437ab78dfeeaae4) f4e94c6f Make usage ping scheduling more robust
\| *	Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'	Grzegorz Bizon	2017-10-18	6	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917 (cherry picked from commit 0fa2f14857ceb5b5b52595555bb2c3e6e930e1f7) 5ee58c1c Add short_revision and use total_size 6d2338c7 Fix failed test 6ac0a69b Fix broken test
\| *	Merge branch 'bvl-fix-deleting-forked-projects' into 'master'	Douwe Maan	2017-10-18	4	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors when deleting a forked project Closes #39196 See merge request gitlab-org/gitlab-ce!14916 (cherry picked from commit 85d8ab52ca27c5bcd9036aa81a9f0ace9794ee0d) 2c0b6776 Fix errors when deleting a forked project
\| *	Merge branch 'prevent-creating-multiple-application-settings' into 'master'	Yorick Peterse	2017-10-18	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent creating multiple ApplicationSetting by forcing it to always have id=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718 (cherry picked from commit 65a1cbc600cf36ff5db9644072e4bf1e2b8e5cde) c909b6aa Prevent creating multiple ApplicationSetting by forcing it to always have id=1
\| *	Merge branch ↵	Rémy Coutable	2017-10-18	2	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass' into 'master' Resolve "Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits::Error: #<NoMethodError: undefined method `map' for nil:NilClass" Closes #39181 See merge request gitlab-org/gitlab-ce!14907 (cherry picked from commit 526c47618e446bfec776b6e17462298f17fb24ee) 9245bfc2 Handle null serialised commits in background migration
\| *	Merge branch 'bump-git-2-13-6' into 'master'	Rémy Coutable	2017-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Git version to 2.13.6 See merge request gitlab-org/gitlab-ce!14906 (cherry picked from commit 4220cd0fa25b89fe70ff74d21f6cf8f72d9a2cd8) ca2d1f9f Bump Git version to 2.13.6
\| *	Merge branch 'update-new-project-docs' into 'master'	Achilleas Pipinellis	2017-10-18	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update new project docs See merge request gitlab-org/gitlab-ce!14893 (cherry picked from commit 7685314fd22f27b45e2e8522f922f5b52538063d) e11ef753 Update new project docs
\| *	Merge branch 'fl-autodevops-fix' into 'master'	Phil Hughes	2017-10-18	10	-31/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove banner from pipelines page Closes #38641, #39051, and #38827 See merge request gitlab-org/gitlab-ce!14849 (cherry picked from commit 7996be6070439f6faf379c116764ea45090fb930) 87cff693 Remove banner from pipelines page c88fef16 Format banner like service desk 05f21311 Update link to settings page instead of documentation page 68343b99 Improve mobile view ea852324 Removes unneeded CSS 4eac69c5 Remove extra class breaking layout in smaller screens db5ebef3 Improve check for permissions on empty project page
\| *	Merge branch 'patch-19' into 'master'	Sean McGivern	2017-10-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update postgresql requirements See merge request gitlab-org/gitlab-ce!14885 (cherry picked from commit 03699653d6946a4b6ee178214d864d1add4f5cf1) dbfc82df update postgresql requirements
\| *	Merge branch 'winh-indeterminate-dropdown' into 'master'	Phil Hughes	2017-10-18	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment for indeterminate marker in dropdowns Closes #38963 See merge request gitlab-org/gitlab-ce!14809 (cherry picked from commit 22ef1c1a4b7927b664c5b589d222970af08fd814) 56e6dab0 Fix alignment for indeterminate marker in dropdowns
\| *	Merge branch 'an/popen-deadline' into 'master'	Sean McGivern	2017-10-18	5	-1/+208
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Popen with a timeout See merge request gitlab-org/gitlab-ce!14872 (cherry picked from commit 8aa6e7ef030a9e7522c533c7e177a618f37265ec) b88e8aae Popen with a timeout f09a7b3c Linter fixes
\| *	Merge branch 'implements-closing-docs' into 'master'	Sean McGivern	2017-10-18	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs for Add "implements" to the default issue closing message regex See merge request gitlab-org/gitlab-ce!14880 (cherry picked from commit fde837d53120a24b2ba512327185f0705e56c9c6) 82f9e809 Update automatic_issue_closing.md
\| *	Merge branch ↵	Kamil Trzciński	2017-10-18	4	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master' Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count` Closes #38960 See merge request gitlab-org/gitlab-ce!14807 (cherry picked from commit 076231798dd9716479d8eef118678eeb7c2c7b11) a6b2387d Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead…
\| *	Merge branch '39111-remove-n-shortcut' into 'master'	Filipa Lacerda	2017-10-18	1	-4/+0
\|/ \| \| \| \| \| \| \| \| \| \|	Remove global dropdown shortcut from help modal Closes #39111 See merge request gitlab-org/gitlab-ce!14876 (cherry picked from commit 93139aa84aaef72812dad70f38e2f60b206eecde) cb29df7f Remove global dropdown shortcut from help modal
*	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