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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	Fix incorrect merge in GitLab QA entry pageqa/gb/fix-gitlab-qa-entrypoint-bad-merge	Grzegorz Bizon	2017-11-22	1	-1/+1
\|/
*	Update VERSION to 10.2.0v10.2.0	Michael Kozono	2017-11-21	1	-1/+1
\|
*	Update CHANGELOG.md for 10.2.0	Michael Kozono	2017-11-21	165	-837/+187
\| \| \|	[ci skip]
*	Resolve conflicts in lib/tasks/gitlab/cleanup.rake10-2-stable-prepare-final	Winnie Hellmann	2017-11-21	1	-4/+0
\|
*	Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'	Stan Hu	2017-11-21	2	-0/+49
\| \| \| \| \| \| \| \| \| \| \| \| \|	ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Closes #40291 See merge request gitlab-org/gitlab-ce!15520 (cherry picked from commit b462edfddbd8e8b4449a6ae8cf482a9255f5d550) Conflicts: lib/tasks/gitlab/cleanup.rake
*	Merge branch '10-2-hashed-storage-file-uploader' into 'master'	Stan Hu	2017-11-21	2	-15/+45
\| \| \| \| \| \| \| \| \|	FileUploader should use Hashed Storage only when project is migrated See merge request gitlab-org/gitlab-ce!15526 (cherry picked from commit c63c41afca6d184d22283c2b4f4363bb1ddaaf89) d087b4da FileUploader should check for hashed_storage?(:attachments) to use disk_path
*	Merge branch 'sh-optimize-read-only-check' into 'master'	Douwe Maan	2017-11-21	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize read-only middleware so that it does not consume as much CPU Closes #40185 and gitlab-com/infrastructure#3240 See merge request gitlab-org/gitlab-ce!15504 (cherry picked from commit 6c3398165469de7890cd7881b175858f7c6be8e5) 3c52e2f0 Optimize read-only middleware so that it does not consume as much CPU cba68d33 use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers` 91075c82 check for `read_only?` first before seeing if request is disallowed aeb2f49f Revert "check for `read_only?` first before seeing if request is disallowed"
*	Merge branch 'opt-in-gitaly' into '10-2-stable'	Stan Hu	2017-11-21	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Opt in gitaly See merge request gitlab-org/gitlab-ce!15522
\| *	Mark all gitaly features as opt-inopt-in-gitaly	Alejandro Rodríguez	2017-11-21	1	-1/+1
\|/
*	Update VERSION to 10.2.0-rc4v10.2.0-rc4	Winnie Hellmann	2017-11-20	1	-1/+1
\|
*	Merge branch 'fix-conflict-highlighting' into 'master'10-2-stable-prepare-rc4	Douwe Maan	2017-11-20	3	-4/+11
\| \| \| \| \| \| \| \| \|	Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463 (cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b) 64a9e53b Fix conflict highlighting
*	Merge branch ↵	Rémy Coutable	2017-11-20	2	-7/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master' Fix Gitlab::Git::Repository#remote_tags using unexisting variable Closes #40300 See merge request gitlab-org/gitlab-ce!15466 (cherry picked from commit c563661f910934f1103690d46f9af8a75423077d) 63beaa32 Fix Gitlab::Git::Repository#remote_tags using unexisting variable d622a8c5 Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use
*	Merge branch 'bvl-fix-count-with-selects' into 'master'	Douwe Maan	2017-11-20	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \|	Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456 (cherry picked from commit c406824d319e5b1a073af7cf55c3f24bfa66e2a4) 5a335c4d Remove the selects when counting the last page
*	Merge branch '4056-hashed-storage-upload-transfers' into 'master'	Stan Hu	2017-11-20	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \|	Fix project transfer with hashed-storage attachments Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15457 (cherry picked from commit 121508f81fec8773af37a345abb6c33b7a3c4518) 9b3b0f02 Fix project transfer with hashed-storage attachments
*	Update VERSION to 10.2.0-rc3v10.2.0-rc3	Michael Kozono	2017-11-17	1	-1/+1
\|
*	Merge branch '10-2-stable-prepare-rc3' into '10-2-stable'	Winnie Hellmann	2017-11-17	118	-574/+1693
\|\ \| \| \| \| \| \| \| \|	Prepare 10.2 RC3 release See merge request gitlab-org/gitlab-ce!15404
\| *	Merge branch 'fix/git-env-repo-paths' into 'master'	Douwe Maan	2017-11-17	3	-11/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative git object paths to construct absolute ones before setting Env See merge request gitlab-org/gitlab-ce!15376 (cherry picked from commit 6ca24bd2e196ba3509d52b167bf7592c0afa2793) 52bfd064 Use relative git object paths to construct absolute ones before setting Env
\| *	Merge branch ↵	Douwe Maan	2017-11-17	2	-14/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json' into 'master' Resolve "/groups/gitlab-org/labels.json redirects to /groups/gitlab-org/-/labels/.json" Closes #40230 See merge request gitlab-org/gitlab-ce!15427 (cherry picked from commit 7142af49fa5947d439c1c539140538fc740f5187) 9f921b73 Don't add a trailing slash in group redirects
\| *	Merge branch 'sh-port-hashed-storage-transfer-fix' into 'master'10-2-stable-prepare-rc3	Nick Thomas	2017-11-17	3	-9/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hashed storage with project transfers to another namespace Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15444 (cherry picked from commit 76b2a7caa5219662a29f0eb16f0507aac1976f33) 0c085aaf Fix hashed storage with project transfers to another namespace
\| *	Merge branch 'ci-pipeline-status-query' into 'master'	Kamil Trzciński	2017-11-17	11	-66/+274
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise getting the pipeline status of commits See merge request gitlab-org/gitlab-ce!15332 (cherry picked from commit 6d36c3b5de7772415b1176b8247c34053b826a74) ab16a6fb Optimise getting the pipeline status of commits
\| *	Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'	Sean McGivern	2017-11-17	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix go-import meta data when enabled_git_access_protocol is a blank string Closes #40256 See merge request gitlab-org/gitlab-ce!15448 (cherry picked from commit 69dd59aec9e5f8959fa36eb74db28d71aad4212b) f767dd4a Fix go-import meta data when enabled_git_access_protocol is a blank string
\| *	Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'	Sean McGivern	2017-11-17	5	-33/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert migration to populate latest merge request ID into a background migration See merge request gitlab-org/gitlab-ce!15440 (cherry picked from commit 2dff37762f76b195d6b36d73dab544d0ec5e6c83) 5cecff89 Convert migration to populate latest merge request ID into a background migration
\| *	Merge branch 'dm-avatarable-with-asset-host' into 'master'	Rémy Coutable	2017-11-17	8	-131/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always return full avatar URL for private/internal groups/projects when asset host is set See merge request gitlab-org/gitlab-ce!15288 (cherry picked from commit f24a78f2801608be7c3b9d3a0dad90656880f097) 0cf25867 Always return full avatar URL for private/internal groups/projects when asset host is set d4babd26 Remove specs that are testing behavior already tested in Avatarable unit tests
\| *	Merge branch 'fix/sm/fix-condeclimate-version' into 'master'	Winnie Hellmann	2017-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set 0.69.0 instead of latest for codeclimate image See merge request gitlab-org/gitlab-ce!15445 (cherry picked from commit 10c216dabb44605d5e8711a0158e3087289e8889) 06c9327c Set 0.69.0 instead of latest for codeclimate image
\| *	Merge branch 'docs/refactor-cluster' into 'master'	Marcia Ramos	2017-11-17	2	-33/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Cluster docs Closes #39952 See merge request gitlab-org/gitlab-ce!15418 (cherry picked from commit d41e66cb632cf4a51428c87a07cbdd182e3e0697) 644a2941 Add info about the installed apps in the Cluster docs b7a01e08 Add info on creating your own k8s cluster from the cluster page ee7ecc81 Add Ingress description from official docs 3b9773fc Change to Google Kubernetes Cluster and add internal links bacf671a Move installation of apps higher
\| *	Merge branch 'cache-user-keys-count' into 'master'	Douwe Maan	2017-11-17	13	-29/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache the number of user SSH keys See merge request gitlab-org/gitlab-ce!15401 (cherry picked from commit 66bf283d0af91d916a00f269eab062b19f690c6a) 3e561736 Cache the number of user SSH keys
\| *	Merge branch 'bvl-isolate-fork-network-background-migrations' into 'master'	Rémy Coutable	2017-11-17	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Isolate the fork network background migrations See merge request gitlab-org/gitlab-ce!15393 (cherry picked from commit c5720382e67b18258c71d717c0e8073cc322b308) f961744b Isolate the fork network background migrations
\| *	Merge branch 'update-metrics-for-k8s-1.7' into 'master'	Tim Zallmann	2017-11-17	2	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update queries to remove duplicate entries (CE version) See merge request gitlab-org/gitlab-ce!15254 (cherry picked from commit 96764f2649aed61be92129c02a5425f36c561394) bc58f625 Adjust metrics to ignore Job tag to support k8s 1.7+ ab9acf1a Fix to use variable 41d1843f Fix CPU metric 712d5d89 Change label to be more consistent, not a series. 33fa4ef6 Uodate docs
\| *	Merge branch 'dm-notes-actions-noteable-for-update' into 'master'	Sean McGivern	2017-11-17	4	-3/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure NotesActions#noteable returns a Noteable in the update action Closes #40208 See merge request gitlab-org/gitlab-ce!15421 (cherry picked from commit 5fbda2af920a86e11696cae5b3397c3241f21b77) f691010d Make sure NotesActions#noteable returns a Noteable in the update action
\| *	Merge branch 'bvl-adjust-openid_connect_spec' into 'master'	Sean McGivern	2017-11-17	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust openid_connect_spec to use `raise_error` Closes #40093 See merge request gitlab-org/gitlab-ce!15420 (cherry picked from commit 37cca88d055491d1b2b15b72aa6968eb076da2a0) a37427f6 Adjust openid_connect_spec to use `raise_error`
\| *	Merge branch 'backport-delete-epic' into 'master'	Filipa Lacerda	2017-11-17	8	-20/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport delete epic changes Closes #40162 See merge request gitlab-org/gitlab-ce!15414 (cherry picked from commit c3d8bc354844defee3375f8cb7a94d5a1002b1db) c6c493a7 Backport delete epic changes
\| *	Merge branch 'jramsay-30140-update-docs' into 'master'	Douwe Maan	2017-11-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readme only default project view preference See merge request gitlab-org/gitlab-ce!15415 (cherry picked from commit df7e00b786c3b9dcfd840e5569ee78c53b72435d) 4a6ec1e0 Add readme only default project view preference
\| *	Merge branch 'fix/gb/update-registry-path-reference-regexp' into 'master'	Kamil Trzciński	2017-11-16	3	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update container repository path reference Closes #40199 See merge request gitlab-org/gitlab-ce!15417 (cherry picked from commit e07b0bd2954d1c95499d3303289bef0a17296667) f4df4f9e Update container repository path reference 3e3c84a7 Add changelog for container repository path update
\| *	Merge branch '40198-fix-gpg-badge-links' into 'master'	Phil Hughes	2017-11-16	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clicking on GPG verification badge jumps to top of the page" Closes #40198 See merge request gitlab-org/gitlab-ce!15407 (cherry picked from commit 3ba84d4ba5953f5cf603fbf7e0e2d2bcf03f93eb) d75b3380 fix issue where clicking GPG verification badge would cause page to scroll to top 4a5046c4 add CHANGELOG.md entry for !15407
\| *	Merge branch '3615-improve-welcome-screen' into 'master'	Tim Zallmann	2017-11-15	7	-102/+169
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize landing page for new users See merge request gitlab-org/gitlab-ce!15191 (cherry picked from commit 6ffb9ffd4ad54fc452f9ae1e97a41f7a83f96a1c) 0a7a9bbd Reorganize landing page for new users 6377821a Add mobile styles 250d606a Update new project icon f014fce1 Add four blocks to each welcome page 5c909f2b Add new icon; update content 95ab3bf5 Use flexbox instead of bootstrap columns
\| *	Merge branch 'tree_item_limit' into 'master'	Douwe Maan	2017-11-15	5	-7/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate tree to max 1,000 items and display notice to users Closes #39746 See merge request gitlab-org/gitlab-ce!15333 (cherry picked from commit 69953fae36560773a06bbc426747e3dac6aa1ae1) 03b1bcbb Truncate tree to max 1,000 items and display notice to users
\| *	Merge branch '39573-hashed-storage-backup' into 'master'	Stan Hu	2017-11-15	4	-9/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab:backup rake for hashed storage based repositories Closes #39573 See merge request gitlab-org/gitlab-ce!15400 (cherry picked from commit 43cb480aaa876db8023aaa17625c384c4e870045) f4c7fea6 Fix dumping hashed storage based repository cf6efd65 Changelog
\| *	Merge branch 'workhorse-3-3-1' into 'master'	Rémy Coutable	2017-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-workhorse to v3.3.1 See merge request gitlab-org/gitlab-ce!15371 (cherry picked from commit 81e94ce1761b48b73be2a8d71938dfe934921e35) d387b0ad Update gitlab-workhorse to v3.3.1
\| *	Merge branch 'rs-qa-default-timeout' into 'master'	Grzegorz Bizon	2017-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise the QA Capybara's default wait time from 4 to 10 Closes gitlab-qa#103 See merge request gitlab-org/gitlab-ce!15382 (cherry picked from commit 331c807a40c2c61ea9b14423d65bed7e4fccca33) b09b9b8e Raise the QA Capybara's default wait time from 4 to 10
\| *	Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'	Yorick Peterse	2017-11-15	3	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366 (cherry picked from commit 3730d89fe8578ce827468ebebef9cd6e33ae89f4) aaf18bb8 Don't try to create fork network memberships for forks of forks
\| *	Merge branch 'issue_40058' into 'master'	Sean McGivern	2017-11-15	3	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357 (cherry picked from commit fb7abd87daa8930682b05870361fe9dd112f050f) aefefbf1 Prevents position update for image diff notes
\| *	Merge branch '40092-fix-cluster-size' into 'master'	Tim Zallmann	2017-11-15	4	-2/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359 (cherry picked from commit 8902bdec4d54de0e50657c897a9ade413c443924) 476b28a1 Formats bytes to human reabale number in registry table
\| *	Merge branch 'slack_landing_page-ce-backport' into 'master'	Jacob Schatz	2017-11-15	5	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354 (cherry picked from commit b79e19d974472a49ff01fbfa95ae83a4fcc91f97) d4d5e804 url_utility and style backport 81c62652 backport popup vars
\| *	Merge branch 'jej/fix-lfs-integrity-with-forks' into 'master'	Douwe Maan	2017-11-15	7	-56/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle forks in Gitlab::Checks::LfsIntegrity Closes #39902 See merge request gitlab-org/gitlab-ce!15279 (cherry picked from commit c9515ca541ebaa3ce0a3208ab08eb59c580cbed6) 78ea074f Moved LfsIntegrity specs to own file ebd51744 Handle forks in Gitlab::Checks::LfsIntegrity
\| *	Merge branch '40068-runner-sorting-regression' into 'master'	Annabel Dunstone Gray	2017-11-15	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert a regression on runners sorting (!15134) Closes #40068 See merge request gitlab-org/gitlab-ce!15341 (cherry picked from commit c8d594e04e2d12a1c0d68ed80998f0b42f0fc8c5) adac106f Revert a regression on runners sorting (!15134)
\| *	Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'	Tim Zallmann	2017-11-15	5	-14/+26
\|/ \| \| \| \| \| \| \| \| \| \|	Don't perform a JS request when deleting a membership. Closes #39933 and #31720 See merge request gitlab-org/gitlab-ce!15344 (cherry picked from commit 6fa53d297fafbab163fa3e3dd86d10d8f141f2da) a591b1c3 Don't perform a JS request when deleting a membership.
*	Update VERSION to 10.2.0-rc2v10.2.0-rc2	Michael Kozono	2017-11-14	1	-1/+1
\|
*	Merge branch 'dm-authorize-admin-oauth-application' into 'master'10-2-stable-prepare-rc2	Sean McGivern	2017-11-14	2	-5/+14
\| \| \| \| \| \| \| \| \| \| \|	Prevent error when authorizing an admin-created OAauth application without a set owner Closes #40086 See merge request gitlab-org/gitlab-ce!15349 (cherry picked from commit c608c25003906da8c934b99fc0d1bdf6f8e21c90) ade23934 Prevent error when authorizing an admin-created OAauth application without a set owner
*	Merge branch 'fix-subgroup-autocomplete' into 'master'	Rémy Coutable	2017-11-14	3	-1/+21
\| \| \| \| \| \| \| \| \| \| \|	Fix users autocomplete in a subgroup Closes #39452 See merge request gitlab-org/gitlab-ce!15350 (cherry picked from commit 4a1e8188f96744103e51263c9bdc071c8e088690) cf6ff601 Fix users autocomplete in a subgroup
*	Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ↵	Sean McGivern	2017-11-14	4	-27/+29
\| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Revert "add metrics tagging to the sidekiq middleware" Closes #39958 See merge request gitlab-org/gitlab-ce!15285 (cherry picked from commit 43d98cd1ff3ea0dd6a794ba4d1d621415d439985) 7fd3ce41 Revert "add metrics tagging to the sidekiq middleware"