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

	Commit message (Collapse)	Author	Age	Files	Lines
*	add illustration svgs directory to gitignoreremove-svg-sync-script	Mike Greiling	2018-03-09	1	-0/+1
\|
*	move gitlab-svgs from devDependencies to dependencies	Mike Greiling	2018-03-08	1	-1/+1
\|
*	remove illustrations from gitlab repo	Mike Greiling	2018-03-08	71	-71/+0
\|
*	remove svg file sync script	Mike Greiling	2018-03-08	2	-49/+0
\|
*	import gitlab-svgs directly from vendored directory	Mike Greiling	2018-03-08	1	-0/+6
\|
*	Merge branch 'fl-svg' into 'master'	Clement Ho	2018-03-08	17	-3/+17
\|\ \| \| \| \| \| \| \| \|	Update svgs content See merge request gitlab-org/gitlab-ce!17650
\| *	Update svgs contentfl-svg	Filipa Lacerda	2018-03-08	17	-3/+17
\| \|
* \|	Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'	Fatih Acet	2018-03-08	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""You can also press Ctrl-Enter" tooltip lingers after Tab+Enter" Closes #37211 See merge request gitlab-org/gitlab-ce!17560
\| * \|	Hide hotkey tooltip after click event in diff comments37211-diff-comments-fix-ctrl-enter-tooltip	Dennis Tang	2018-03-06	1	-1/+1
\| \| \|
* \| \|	Merge branch 'docs-update-table-tiers-boards' into 'master'	Achilleas Pipinellis	2018-03-08	1	-0/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs update table tiers boards See merge request gitlab-org/gitlab-ce!17651
\| * \| \|	Docs update table tiers boards	Victor Wu	2018-03-08	1	-0/+11
\|/ / /
* \| \|	Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' ↵	Phil Hughes	2018-03-08	6	-93/+89
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Move MemoryGraph and MemoryUsage vue components See merge request gitlab-org/gitlab-ce!17533
\| * \| \|	Move MemoryGraph and MemoryUsage vue components	George Tsiolis	2018-03-08	6	-93/+89
\| \| \| \|
* \| \| \|	Update CHANGELOG.md for 10.5.4osw-44052-single-batch-blob-request-to-gitaly-on-discussions	Ian Baum	2018-03-08	13	-61/+21
\| \|_\|/ \|/\| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'	Phil Hughes	2018-03-08	2	-10/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
\| * \| \|	Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-up	Jose Ivan Vargas	2018-03-06	2	-10/+21
\| \| \| \|
* \| \| \|	Merge branch 'docs-vue-templates' into 'master'	Filipa Lacerda	2018-03-08	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename VUE JS to Vue See merge request gitlab-org/gitlab-ce!17649
\| * \| \| \|	Rename VUE JS to Vuedocs-vue-templates	Clement Ho	2018-03-08	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fl-updat-svg-dependency' into 'master'	Clement Ho	2018-03-08	2	-4/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates svg dependency See merge request gitlab-org/gitlab-ce!17645
\| * \| \| \|	Updates svg dependencyfl-updat-svg-dependency	Filipa Lacerda	2018-03-08	2	-4/+4
\| \| \| \| \|
* \| \| \| \|	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
\| * \| \| \| \|	Fix Error 500 when updating a projectsh-fix-update-service	Stan Hu	2018-03-08	2	-1/+10
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
* \| \| \| \|	Merge branch 'update-templates-and-dependencies-10-6' into 'master'	Robert Speicher	2018-03-08	7	-200/+357
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates and licenses See merge request gitlab-org/gitlab-ce!17637
\| * \| \| \| \|	Update templates and licensesupdate-templates-and-dependencies-10-6	James Lopez	2018-03-08	7	-200/+357
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-guides-10-6' into 'master'	Robert Speicher	2018-03-08	2	-2/+363
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update guides for 10.6 See merge request gitlab-org/gitlab-ce!17635
\| * \| \| \| \|	update guides for 10.6update-guides-10-6	James Lopez	2018-03-08	2	-2/+363
\| \|/ / / /
* \| \| \| \|	Merge branch 'gitlab-git-duplicate-code' into 'master'	Sean McGivern	2018-03-08	1	-18/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate method definitions See merge request gitlab-org/gitlab-ce!17478
\| * \| \| \| \|	Remove duplicate method definitions	Jacob Vosmaer	2018-03-08	1	-18/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '40525-listing-user-activity-timeouts' into 'master'	Yorick Peterse	2018-03-08	4	-9/+46
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
\| * \| \| \| \| \|	Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeouts	Andreas Brandl	2018-03-07	4	-9/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40525.
* \| \| \| \| \| \|	Merge branch 'jprovazn-revert-commit-cleanup' into 'master'	Sean McGivern	2018-03-08	8	-17/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
\| * \| \| \| \| \| \|	Revert "Cleanup after adding MR diff's commit_count"	Jan Provaznik	2018-03-08	8	-17/+6
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
* \| \| \| \| \| \|	Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master'	Yorick Peterse	2018-03-08	3	-0/+57
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add missing foreign key constraint in clusters_applications_ingress" Closes #43802 See merge request gitlab-org/gitlab-ce!17488
\| * \| \| \| \| \| \|	Ensure orphaned rows are deleted before adding the foreign key43802-ensure-foreign-keys-on-clusters-applications	Mayra Cabrera	2018-03-07	2	-2/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Ensure foreign keys on Clusters Applications	Mayra Cabrera	2018-03-07	3	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #43802
* \| \| \| \| \| \| \|	Merge branch 'ce-rubocop-naming-filename' into 'master'	Nick Thomas	2018-03-08	28	-147/+224
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add Naming/FileName rule checking expected class/module per filename See merge request gitlab-org/gitlab-ce!17631
\| * \| \| \| \| \| \| \|	[CE] Add Naming/FileName rule checking expected class/module per filename	Gabriel Mazetto	2018-03-08	28	-147/+224
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-add-missing-acts-as-taggable-indices' into 'master'	Yorick Peterse	2018-03-08	3	-0/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding missing indexes migrations from taggings table Closes #43927 See merge request gitlab-org/gitlab-ce!17563
\| * \| \| \| \| \| \| \|	Adding missing indexes on taggings tablesh-add-missing-acts-as-taggable-indices	Stan Hu	2018-03-07	3	-0/+28
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API requests were timing out because `tag_id` was missing an index. These migrations were imported by running https://github.com/mbleigh/acts-as-taggable-on#post-installation: ``` bundle exec rake acts_as_taggable_on_engine:install:migrations ``` It looks like the `acts-as-tagglable` gem added the indexes in v4.0.0, but when we upgraded from v3.5.0 (back in 2016 via f571aeb5ce38dce1a9e5f58d76360836d4a8f8a0) we did not add them. On staging, there are about 10.7 million rows on the `taggings` table. It took about 30 seconds for each index to be created. On production, there are about 17.4 million rows, so I suspect the time to be about a minute per index. Closes #43927
* \| \| \| \| \| \| \|	Merge branch 'sh-add-section-name-index' into 'master'	Yorick Peterse	2018-03-08	3	-1/+29
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index on section_name_id on ci_build_trace_sections table Closes #44008 See merge request gitlab-org/gitlab-ce!17632
\| * \| \| \| \| \| \|	Add index on section_name_id on ci_build_trace_sections tablesh-add-section-name-index	Stan Hu	2018-03-08	3	-1/+29
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was causing user deletions to time out. Closes #44008
* \| \| \| \| \| \|	Merge branch 'docs-exception-request-labels' into 'master'	Sean McGivern	2018-03-08	1	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that the Pick Into X.Y label is added after approval See merge request gitlab-org/gitlab-ce!17636
\| * \| \| \| \| \| \|	Clarify that the Pick Into X.Y label is added after approval	Sean McGivern	2018-03-08	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-remove-double-caching-repo-empty' into 'master'	Sean McGivern	2018-03-08	3	-5/+10
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
\| * \| \| \| \| \| \|	Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-empty	Stan Hu	2018-03-07	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We saw that in a customer instance, `empty?` was cached to be `true` even though `has_visible_content?` and `exists?` were `true`. This double caching can run into edge cases because there's no guarantee that the inner values will properly expire the outer one, especially if there is Redis replication lag. Consider this scenario: 1. `exists?` and `has_visible_content?` are false 2. `empty?` is expired 3. A subsequent call to `empty?` returns `true` because `exists?` is false even though `empty` is true 4. `exists?` and `has_visible_content?` are then expired 5. `exists?` and `has_visible_content?` are set to true 6. `empty?` is still stuck in the wrong value as `true` Closes #43882
* \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Filipa Lacerda	2018-03-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to Merge Request Coach See merge request gitlab-org/gitlab-ce!17633
\| * \| \| \| \| \| \| \|	Fix link to Merge Request Coach	Fabien Catteau	2018-03-08	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-03-08	8	-51/+91
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' Resolve "Change Clear Runners cache UJS action to an API request" Closes #43770 See merge request gitlab-org/gitlab-ce!17466
\| * \| \| \| \| \| \| \|	Fix broken tests43770-change-clear-runners-cache-ujs-action-to-an-axios-request	Filipa Lacerda	2018-03-07	2	-9/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	[ci skip] Merge branch 'master' into ↵	Filipa Lacerda	2018-03-07	120	-920/+2712
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (68 commits) Upgrade Workhorse to 4.0.0 naming things Update GitLab Pages to v0.7.0 Minor fixes in API doc Use Project#full_name instead of name_with_namespace Fix tests not completely disabling Gitaly Move OperationService#UserRemoveBranch Move OperationService#UserCreateBranch Move CommitService#Languages to OPT_OUT Move RefService#CreateBranch to OPT_OUT Move RefService#DeleteBranch to OPT_OUT Move OperationService#UserRevert to OPT_OUT Move OperationService#UserAddTag to OPT_OUT Move CommitService::CommitPatch to OPT_OUT Change to Pacific Time Zone Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5' Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5' Remove wrong assumption about Runners cache GC Add CommonMark markdown engine add nginx_status monitoring details ...