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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.6.0-rc5v10.6.0-rc5	Robert Speicher	2018-03-14	1	-1/+1
\|
*	Merge branch '10-6-stable-prepare-rc5' into '10-6-stable'	Robert Speicher	2018-03-14	69	-340/+1497
\|\ \| \| \| \| \| \| \| \|	Prepare 10.6 RC5 release See merge request gitlab-org/gitlab-ce!17723
\| *	Merge branch '35475-lazy-diff' into 'master'10-6-stable-prepare-rc5	Fatih Acet	2018-03-14	8	-14/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" Closes #35475 See merge request gitlab-org/gitlab-ce!15200
\| *	Merge branch 'revert-238781a6' into 'master'	Robert Speicher	2018-03-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-filter-secret-variables' into 'master'" See merge request gitlab-org/gitlab-ce!17733
\| *	Merge branch 'pages-0-7-1' into 'master'	Robert Speicher	2018-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Upgrade GitLab Pages to v0.7.1 See merge request gitlab-org/gitlab-ce!17732
\| *	Merge branch '44024-fix-table-extra-column' into 'master'	Clement Ho	2018-03-13	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown table showing extra fake column v1 Closes #44024 See merge request gitlab-org/gitlab-ce!17669
\| *	Merge branch '44149-issue-comment-buttons' into 'master'	Phil Hughes	2018-03-13	9	-7/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wrong button has the loading state when submitting a comment in issues" Closes #44149 See merge request gitlab-org/gitlab-ce!17698
\| *	Merge branch '44152l-last-pipeline-link' into 'master'	Phil Hughes	2018-03-13	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make commit pipeline accessible on file page Closes #44152 See merge request gitlab-org/gitlab-ce!17716
\| *	Merge branch 'bvl-inconsistent-spelling-in-mr-form' into 'master'	Douwe Maan	2018-03-13	3	-20/+90
\| \| \| \| \| \| \| \| \| \|	Fix inconsistent punctuation on MR form See merge request gitlab-org/gitlab-ce!17702
\| *	Merge branch 'gitaly-0.89.0' into 'master'	Robert Speicher	2018-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.89.0 See merge request gitlab-org/gitlab-ce!17696
\| *	Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'	Nick Thomas	2018-03-13	3	-4/+21
\| \| \| \| \| \| \| \| \| \|	Fix code and wiki search results when filename is non-ASCII See merge request gitlab-org/gitlab-ce!17685
\| *	Merge branch '44096-update-zaproxy-image-in-auto-devops-template' into 'master'	Dmitriy Zaporozhets	2018-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update zaproxy image in Auto DevOps template" Closes #44096 See merge request gitlab-org/gitlab-ce!17683
\| *	Merge branch 'tc-api-fix-expose_url' into 'master'	Stan Hu	2018-03-13	3	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect the protocol in `expose_url` Closes gitlab-ee#5217 See merge request gitlab-org/gitlab-ce!17681
\| *	Merge branch 'fix-duplicate-notes' into 'master'	Filipa Lacerda	2018-03-13	7	-17/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671
\| *	Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'	Yorick Peterse	2018-03-13	3	-1/+36
\| \| \| \| \| \| \| \| \| \| \| \|	Add partial indexes on todos to handle users with many todos See merge request gitlab-org/gitlab-ce!17668
\| *	Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ↵	Douwe Maan	2018-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add `?ci_cd_only=true` query parameter to CI/CD GitHub status link -- CE backport See merge request gitlab-org/gitlab-ce!17661
\| *	Merge branch 'docs-update-table-tiers-boards' into 'master'	Achilleas Pipinellis	2018-03-13	1	-0/+11
\| \| \| \| \| \| \| \| \| \|	Docs update table tiers boards See merge request gitlab-org/gitlab-ce!17651
\| *	Merge branch 'update-templates-and-dependencies-10-6' into 'master'	Robert Speicher	2018-03-13	7	-200/+357
\| \| \| \| \| \| \| \| \| \|	Update templates and licenses See merge request gitlab-org/gitlab-ce!17637
\| *	Merge branch 'update-guides-10-6' into 'master'	Robert Speicher	2018-03-13	2	-2/+363
\| \| \| \| \| \| \| \| \| \|	Update guides for 10.6 See merge request gitlab-org/gitlab-ce!17635
\| *	Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'	Sean McGivern	2018-03-13	5	-34/+65
\| \| \| \| \| \| \| \| \| \|	Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630
\| *	Merge branch 'sh-remove-double-caching-repo-empty' into 'master'	Sean McGivern	2018-03-13	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
\| *	Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master'	Yorick Peterse	2018-03-13	3	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add missing foreign key constraint in clusters_applications_ingress" Closes #43802 See merge request gitlab-org/gitlab-ce!17488
\| *	Merge branch '40525-listing-user-activity-timeouts' into 'master'	Yorick Peterse	2018-03-13	4	-9/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
\| *	Merge branch '43259-document-persistent-images-for-autodevops-deployments' ↵	Achilleas Pipinellis	2018-03-13	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add a note about persistent images for auto devops deployments Closes #43259 See merge request gitlab-org/gitlab-ce!17338
\| *	Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'	Phil Hughes	2018-03-13	4	-14/+20
\|/ \| \| \| \| \| \|	Fix "Remove source branch" button in MR widget during MWPS state Closes #42814 and #4281 See merge request gitlab-org/gitlab-ce!17192
*	Update VERSION to 10.6.0-rc4v10.6.0-rc4	Filipa Lacerda	2018-03-12	1	-1/+1
\|
*	Merge branch '10-6-stable-frozen' into '10-6-stable'	Robert Speicher	2018-03-12	246	-1315/+4304
\|\ \| \| \| \| \| \| \| \|	Merge 10-6-stable-frozen into 10-6-stable See merge request gitlab-org/gitlab-ce!17644
\| *	Merge branch '10-6-stable' into 10-6-stable-frozen10-6-stable-frozen	James Lopez	2018-03-12	1	-0/+42
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # locale/gitlab.pot
\| * \|	Merge branch 'sh-fix-update-service' into 'master'	James Lopez	2018-03-08	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when updating a project Closes #44019 See merge request gitlab-org/gitlab-ce!17647
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 10-6-stable-frozen	James Lopez	2018-03-08	256	-1375/+4460
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # GITLAB_PAGES_VERSION
\| \| * \	Merge branch 'ce-jej/github-project-service-for-ci' into 'master'	Douwe Maan	2018-03-08	11	-15/+98
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
\| \| \| * \|	Hides Triggers if integration only has one event	James Edwards-Jones	2018-03-08	4	-2/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes confusing/unnecessary checkboxes when trying to configure an integration. If there is only one supported event we don't need to allow these to be individually disabled since the integration can be disabled instead. E.g. Project Integrations for GitHub, Bugzilla, Asana, Pipeline emails and Gemnasium Allows integrations to override which triggers are configurable
\| \| \| * \|	Service integration displays validation errors on test fail	James Edwards-Jones	2018-03-07	3	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes attempts to update a service integration which had `can_test?` set to true but validations were causing the "Test and save changes" button to return "Something went wrong on our end." Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6
\| \| \| * \|	Backport changes from EE's GithubService integration	James Edwards-Jones	2018-03-07	5	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
\| \| * \| \|	Merge branch 'unassign-when-leaving' into 'master'	Robert Speicher	2018-03-08	7	-116/+95
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't delete todos or unassign issues and MRs when a user leaves a project Closes #43899 See merge request gitlab-org/gitlab-ce!17615
\| \| \| * \| \|	Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leaving	Douwe Maan	2018-03-07	7	-116/+95
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'bvl-port-ee-improvements-from-maintainer-push' into 'master'	Douwe Maan	2018-03-08	6	-18/+32
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port changes from EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4885 (Maintainer push to fork) See merge request gitlab-org/gitlab-ce!17629
\| \| \| * \| \| \|	Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-push	Bob Van Landuyt	2018-03-08	1	-6/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Address frontend feedback	Bob Van Landuyt	2018-03-08	5	-12/+29
\| \| \|/ / / /
\| \| * \| \| \|	Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'	Filipa Lacerda	2018-03-07	6	-32/+60
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backport of custom metrics for the common metrics section of CE See merge request gitlab-org/gitlab-ce!17586
\| \| \| * \| \| \|	backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontend	Jose Ivan Vargas	2018-03-07	6	-32/+60
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'da-update-project-activity' into 'master'	Stan Hu	2018-03-07	2	-1/+13
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update project activity when pushing to a wiki repository See merge request gitlab-org/gitlab-ce!17621
\| \| \| * \| \| \| \|	Update project activity when pushing to a wiki repositoryda-update-project-activity	Douglas Barbosa Alexandre	2018-03-07	2	-1/+13
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'	Douwe Maan	2018-03-07	11	-59/+194
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create CI/CD-only projects from GitHub -- CE backport See merge request gitlab-org/gitlab-ce!17432
\| \| \| * \ \ \ \ \	Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-fe	Douwe Maan	2018-03-07	120	-275/+1694
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # locale/gitlab.pot
\| \| \| * \| \| \| \| \| \|	CE backport for creating CI/CD projects from GitHub	Rubén Dávila	2018-03-07	11	-94/+214
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'docs-fe-typo' into 'master'	Jacob Schatz	2018-03-07	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix accessibility typo See merge request gitlab-org/gitlab-ce!17612
\| \| \| * \| \| \| \| \| \| \|	Fix accessibility typodocs-fe-typo	Clement Ho	2018-03-07	1	-1/+1
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'backport-ee-3892-to-ce' into 'master'	Douwe Maan	2018-03-07	2	-0/+11
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE See merge request gitlab-org/gitlab-ce!17608
\| \| \| * \| \| \| \| \| \| \|	Backport relevant changes from EE ↵backport-ee-3892-to-ce	Tiago Botelho	2018-03-07	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE