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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	resolves changes in app.vue	Jacob Schatz	2018-01-22	1	-57/+18
\| \|
\| *	Merge branch 'fix-description-loss' into 'master'	Phil Hughes	2018-01-22	2	-0/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confirm when navigating away from page Closes #42102 See merge request gitlab-org/gitlab-ce!16518
\| *	Merge branch 'tz-fix-ide-bugs' into 'master'	Phil Hughes	2018-01-22	25	-76/+211
\| \| \| \| \| \| \| \| \| \| \| \|	WebIDE: Fix Commit bugs See merge request gitlab-org/gitlab-ce!16459
\| *	Merge branch 'docs/dast-cleanup' into 'master'	Marcia Ramos	2018-01-22	1	-8/+13
\| \| \| \| \| \| \| \| \| \|	Add more info on how DAST works See merge request gitlab-org/gitlab-ce!16615
\| *	Merge branch 'sh-fix-error-500-no-avatars' into 'master'	Robert Speicher	2018-01-22	3	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
\| *	Merge branch '42225-mr-icons' into 'master'	Phil Hughes	2018-01-22	12	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "MR widget components have different icons in CE and EE" Closes #42225 See merge request gitlab-org/gitlab-ce!16587
\| *	Merge branch 'bvl-parent-preloading' into 'master'	Douwe Maan	2018-01-22	6	-14/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filtering projects & groups on group pages Closes #40785 See merge request gitlab-org/gitlab-ce!16584
\| *	Merge branch 'sh-scheduled-ci-pipeline-docs' into 'master'	Achilleas Pipinellis	2018-01-22	3	-0/+15
\| \| \| \| \| \| \| \| \| \|	Add docs for playing a CI pipeline schedule See merge request gitlab-org/gitlab-ce!16568
\| *	Merge branch '42159-utf8-uploads' into 'master'	Douwe Maan	2018-01-22	3	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
\| *	Merge branch 'docs/runners-clear-cache' into 'master'	Marcia Ramos	2018-01-22	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cache clearing documentation Closes #41940 See merge request gitlab-org/gitlab-ce!16559
\| *	Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master'	Marcia Ramos	2018-01-22	1	-0/+6
\| \| \| \| \| \| \| \| \| \|	Add release added and release backported to CE See merge request gitlab-org/gitlab-ce!16553
\| *	Merge branch 'issue_37143_2' into 'master'	Sean McGivern	2018-01-22	5	-2/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
\| *	Merge branch 'docs/refactor-k8s-cluster' into 'master'	Marcia Ramos	2018-01-22	2	-45/+241
\| \| \| \| \| \| \| \| \| \|	Improve Clusters documentation See merge request gitlab-org/gitlab-ce!16435
\| *	Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'	Stan Hu	2018-01-22	3	-0/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete conflicting orphaned routes before validation Closes #39551 See merge request gitlab-org/gitlab-ce!16242
\| *	Merge branch 'fix-redirect-routes-schema' into 'master'	Yorick Peterse	2018-01-22	4	-3/+76
\|/ \| \| \| \| \|	rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
*	Update VERSION to 10.4.0v10.4.0	Luke Bennett	2018-01-22	1	-1/+1
\|
*	Update CHANGELOG.md for 10.4.0	Luke Bennett	2018-01-22	145	-731/+164
\| \| \|	[ci skip]
*	Update VERSION to 10.4.0-rc8v10.4.0-rc8	Luke Bennett	2018-01-19	1	-1/+1
\|
*	Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'	Marin Jankovski	2018-01-19	50	-139/+361
\|\ \| \| \| \| \| \| \| \|	Prepare 10.4 RC8 release See merge request gitlab-org/gitlab-ce!16557
\| *	Merge branch 'background-migration-fix' into 'master'	Douwe Maan	2018-01-19	3	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce UPDATEs for background column type changes Closes #42158 See merge request gitlab-org/gitlab-ce!16551 (cherry picked from commit 792e9ed7fa46d236c01fb14c8ad7f9b4ea4dee59) 0054d383 Reduce UPDATEs for background column type changes
\| *	Fixes incorrect resolution for applications.vue file10-4-stable-prepare-rc8	Mayra Cabrera	2018-01-18	1	-1/+1
\| \|
\| *	Fix incorrect conflict resolution for cluster JS	Eric Eastwood	2018-01-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/release/tasks/issues/45#note_55157005 Bad commit: https://gitlab.com/gitlab-org/gitlab-ee/commit/ce872e0168 What it should look like: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16506/diffs
\| *	Merge branch 'remove-ide-pref' into 'master'	Tim Zallmann	2018-01-18	2	-29/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454 (cherry picked from commit e56bcf92774b19115f62b609163c44ba9d919e69) af79397f Remove IDE option from user preferences 18abb303 remove specs
\| *	Merge branch 'jramsay-15567-lfs-icon-docs' into 'master'	Marcia Ramos	2018-01-18	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Git LFS status icon to docs See merge request gitlab-org/gitlab-ce!16555 (cherry picked from commit 0392b0a9d56f13016679515c840184c5cad98e8e) de2cb24f Add Git LFS status icon to docs
\| *	Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'	Jacob Schatz	2018-01-18	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537 (cherry picked from commit 50a649530a53a04d2044f9e4c5502586a7ed0c59) b1261ad9 Fix Mermaid drawings not loading on some browsers
\| *	Merge branch 'remove-soft-removals' into 'master'	Douwe Maan	2018-01-18	39	-105/+337
\|/ \| \| \| \| \| \| \| \| \| \| \|	Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789 (cherry picked from commit 7acabf7c5908940665e1a8c4e3d09d423385657a) d0b8f536 Remove soft removals related code e5c49b57 Added tests for removing soft removed objects
*	Update VERSION to 10.4.0-rc7v10.4.0-rc7	Luke Bennett	2018-01-18	1	-1/+1
\|
*	Merge branch '10-4-stable-prepare-rc7' into '10-4-stable'	Luke Bennett	2018-01-18	60	-111/+1299
\|\ \| \| \| \| \| \| \| \|	Prepare 10.4 RC7 release See merge request gitlab-org/gitlab-ce!16519
\| *	Fix badly solved conflicts10-4-stable-prepare-rc7	Filipa Lacerda	2018-01-17	3	-3/+4
\| \|
\| *	fixed eslint	Phil Hughes	2018-01-17	1	-1/+1
\| \|
\| *	Merge branch '10-4-stable-prepare-rc7' of gitlab.com:gitlab-org/gitlab-ce ↵	Phil Hughes	2018-01-17	8	-3/+30
\| \|\ \| \| \| \| \| \| \| \| \|	into 10-4-stable-prepare-rc7
\| \| *	Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵	Filipa Lacerda	2018-01-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
\| \| *	Merge branch '10-4-stable-prepare-rc7' of ↵	Luke Bennett	2018-01-17	3	-0/+17
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
\| \| \| *	Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'	Douwe Maan	2018-01-17	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wiki uploaded files are missing" Closes #42031 See merge request gitlab-org/gitlab-ce!16499 (cherry picked from commit 79b05cdd469726582e916cb606ba14b440a59011) 31e59219 Fix links to uploaded files on wiki pages
\| \| * \|	Merge branch '10-4-stable-prepare-rc7' of ↵	Luke Bennett	2018-01-17	3	-3/+8
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
\| \| * \|	Merge branch 'mr-status-box-update' into 'master'	Filipa Lacerda	2018-01-17	5	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
\| * \| \|	fixed up merge request badge merge	Phil Hughes	2018-01-17	4	-7/+11
\| \| \|/ \| \|/\|
\| * \|	Merge branch '42046-fork-icon' into 'master'	Fatih Acet	2018-01-17	3	-3/+8
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474 (cherry picked from commit 78ca7d97bbb12be11bd2ebeb8b03ae2277c5ec10) d76047a1 fix fork icon size and button icon color on Forks page 3ec647ed Update 42046-fork-icon.yml
\| *	Merge branch 'builds-api-nplusone' into 'master'	Stan Hu	2018-01-17	4	-4/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "N+1 queries with /projects/:project_id/builds API endpoint" Closes #41957 See merge request gitlab-org/gitlab-ce!16445 (cherry picked from commit 191b5153c86964e59400fe086b88b89bb45fe7a9) 7e084984 Add n plus one spec for v3 builds api c9a1a155 Fix N+1 in v3 builds API c9840842 Eager load user, runner, pipeline and its creator 09118796 Add N+1 query spec for Jobs API 87cc0373 Fix N+1 builds query in Jobs list API a4d7f155 Extend N+1 Builds and Jobs API specs 8cef1f4c Add missing newline in Jobs API spec feb34497 Use preload instead of includes to avoid joins
\| *	Merge branch 'docs/sast-dast' into 'master'	Marcia Ramos	2018-01-17	4	-9/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port the SAST DAST doc examples from EE to CE Closes #42007 See merge request gitlab-org/gitlab-ce!16430
\| *	Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'	Stan Hu	2018-01-17	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440 (cherry picked from commit 3228ac06a019c9126b965ff32e354d10011a4f76) c4dd7b82 Prevent RevList failing on non utf8 paths
\| *	Merge branch '41727-target-branch-name' into 'master'	Sean McGivern	2018-01-17	3	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set target_branch to the ref branch when creating MR from issue Closes #41727 See merge request gitlab-org/gitlab-ce!16422 (cherry picked from commit b4bc9bd5c5bedcd57e795f91f0668d7f2c622cde) 7e9484e9 Set target_branch to the ref branch when creating MR from issue
\| *	Merge branch '41874-closed-todo' into 'master'	Douwe Maan	2018-01-17	7	-16/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414
\| *	Merge branch 'sh-remove-import-retry-count-warning' into 'master'	Robert Speicher	2018-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove warning noise in ProjectImportOptions See merge request gitlab-org/gitlab-ce!16410 (cherry picked from commit b384d4781ada21ebb4bf8c703f59f188823b0ada) f4319f6a Remove warning noise in ProjectImportOptions
\| *	Merge branch 'mk-fix-permanent-redirect-validation' into 'master'	Douwe Maan	2018-01-17	4	-1/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397 (cherry picked from commit d607f16fe5a1ec51eaea5811b5118b1ba48acfbc) 1dc30595 Revert "Revert "Fix Route validation for unchanged path"" c517788e Fix Rubocop offense 601c24d5 Add RedirectRoute factory d4c8d1b7 Add changelog entry
\| *	Merge branch ↵	Kamil Trzciński	2018-01-17	5	-38/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41799-managed-prometheus-deployment-install-a-lot-of-extra-stuff' into 'master' Resolve "Managed Prometheus deployment installs a lot of extra stuff" Closes #41799 See merge request gitlab-org/gitlab-ce!16378 (cherry picked from commit 5c51cbca06b099427e15309b352d01d960f641e3) 37d96e7d Use ConfigMap content to populate values.yaml 0a69f490 Fixes suggestions on MR
\| *	Merge branch '10-4-stable-prepare-rc7' of ↵	Luke Bennett	2018-01-17	1	-13/+17
\| \|\ \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
\| \| *	Merge branch ↵	Kamil Trzciński	2018-01-17	1	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master' Include updated AutoDevOps template with Browser Performance using DinD Closes #41809 See merge request gitlab-org/gitlab-ce!16373 (cherry picked from commit ff252f61f73353ae3912707877c350bd6f7eb038) 9d7e0e49 Update AutoDevOps template with browser performance fix
\| * \|	Correct applications.vue conflict?	Luke Bennett	2018-01-17	1	-27/+23
\| \|/
\| *	Merge branch '41797-prometheus-wording-fixes' into 'master'	Kamil Trzciński	2018-01-17	1	-24/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wording fixes on cluster page" Closes #41797 See merge request gitlab-org/gitlab-ce!16324