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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use gitlab-shell 7.1.1gitlab-shell-7.1.1	Jacob Vosmaer	2018-03-23	1	-1/+1
\|
*	Merge branch 'storage-dropdown' into 'master'	Sean McGivern	2018-03-23	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Show gitaly address instead of disk path See merge request gitlab-org/gitlab-ce!17954
\| *	Show gitaly address instead of disk path	Jacob Vosmaer	2018-03-23	1	-1/+1
\| \|
* \|	Merge branch 'jprovazn-issueref' into 'master'	Douwe Maan	2018-03-23	3	-1/+23
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Fix issuable state indicator Closes gitlab-ee#4683 See merge request gitlab-org/gitlab-ce!17878
\| *	Fix issuable state indicator	Jan Provaznik	2018-03-23	3	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the issuable reference check works only in project scope, if we reference an issuable from a non-project resource (e.g. epics), then project is not set, and there is mismatch in generated issue references. This patch enables issuable reference state check also from group scope. Closes gitlab-ee#4683 Related to #30916
* \|	Merge branch '43771-improve-avatar-error-message' into 'master'	Sean McGivern	2018-03-23	6	-10/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Indicate supported image formats in avatar error" Closes #43771 See merge request gitlab-org/gitlab-ce!17747
\| * \|	Change avatar error message to include allowed file formats	Fabian Schneider	2018-03-22	6	-10/+9
\| \| \|
* \| \|	Merge branch ↵	Kamil Trzciński	2018-03-23	3	-7/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information' into 'master' Resolve "Enabling Auto DevOps on an empty project gives you wrong information" Closes #43482 See merge request gitlab-org/gitlab-ce!17605
\| * \| \|	Use actual repo instead of stubbing method43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information	Matija Čupić	2018-03-22	1	-7/+1
\| \| \| \|
\| * \| \|	Refactor AutoDevops pipeline logic into method	Matija Čupić	2018-03-22	1	-8/+13
\| \| \| \|
\| * \| \|	Add CHANGELOG	Matija Čupić	2018-03-11	1	-0/+5
\| \| \| \|
\| * \| \|	Add empty repo check before running AutoDevOps pipeline	Matija Čupić	2018-03-11	2	-5/+37
\| \|/ /
* \| \|	Merge branch 'mark-legacy-git-access' into 'master'	Sean McGivern	2018-03-23	46	-85/+138
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
\| * \| \|	Route path lookups through legacy_disk_pathmark-legacy-git-access	Jacob Vosmaer	2018-03-21	46	-85/+138
\| \| \| \|
* \| \| \|	Merge branch 'winh-deprecate-old-modal' into 'master'	Filipa Lacerda	2018-03-23	12	-135/+158
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename modal.vue to deprecated_modal.vue See merge request gitlab-org/gitlab-ce!17438
\| * \| \| \|	Rename modal.vue to deprecated_modal.vuewinh-deprecate-old-modal	Winnie Hellmann	2018-03-22	12	-135/+158
\| \| \| \| \|
* \| \| \| \|	Merge branch 'increase-unicorn-memory-killer-limits' into 'master'	Douwe Maan	2018-03-23	2	-2/+7
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase the memory limits used in the unicorn killer Closes gitlab-com/infrastructure#19 See merge request gitlab-org/gitlab-ce!17948
\| * \| \| \|	Increase the memory limits used in the unicorn killerincrease-unicorn-memory-killer-limits	DJ Mountney	2018-03-22	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These limits were updated in our docs, and in omnibus some time ago. But the defaults in the source-install were missed.
* \| \| \| \|	Merge branch 'tc-re-add-read-only-banner' into 'master'	Stan Hu	2018-03-23	6	-14/+45
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add read-only banner to all pages Closes #43937 See merge request gitlab-org/gitlab-ce!17798
\| * \| \| \|	Add read-only banner to all pages	Toon Claes	2018-03-22	6	-14/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the database is in a read-only state, display a banner on each page informing the user they cannot write to that GitLab instance. Closes gitlab-org/gitlab-ce#43937.
* \| \| \| \|	Merge branch 'ci-pipeline-commit-lookup' into 'master'	Kamil Trzciński	2018-03-22	3	-5/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use porcelain commit lookup method on CI::CreatePipelineService Closes charts/helm.gitlab.io#291 See merge request gitlab-org/gitlab-ce!17911
\| * \| \| \| \|	Use porcelain commit lookup method on CI::CreatePipelineServiceci-pipeline-commit-lookup	Alejandro Rodríguez	2018-03-22	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before we were using a "plumbing" Gitlab::Git method that does not go through Gitaly migration checking.
* \| \| \| \| \|	Merge branch 'prettier-ignore' into 'master'	Mike Greiling	2018-03-22	2	-73/+57
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added prettierignore file Closes #44483 See merge request gitlab-org/gitlab-ce!17907
\| * \| \| \| \| \|	remove svg.config.js as it no longer exists	Mike Greiling	2018-03-22	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added prettierignore fileprettier-ignore	Phil Hughes	2018-03-21	2	-73/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44483
* \| \| \| \| \| \|	Merge branch 'move-concatenate-module-plugin' into 'master'	Jacob Schatz	2018-03-22	1	-3/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable webpack scope hoisting in development See merge request gitlab-org/gitlab-ce!17942
\| * \| \| \| \| \|	enable scope hoisting only in produciton (it interferes with HMR)	Mike Greiling	2018-03-22	1	-3/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '44382-ui-breakdown-for-create-merge-request' into 'master'	Clement Ho	2018-03-22	3	-7/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI breakdown of message of the last pushed branch for Create merge request Closes #44382 See merge request gitlab-org/gitlab-ce!17821
\| * \| \| \| \| \| \|	Fix UI breakdown for Create merge request button	Takuya Noguchi	2018-03-23	3	-7/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '43273-fix-double-scrollbar-dropdowns' into 'master'	Jacob Schatz	2018-03-22	5	-4/+40
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Some dropdowns have two scroll bars." Closes #43273 See merge request gitlab-org/gitlab-ce!17665
\| * \| \| \| \| \| \| \|	Resolve "Some dropdowns have two scroll bars."	Dennis Tang	2018-03-22	5	-4/+40
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '44365-fix-module-reloading' into 'master'	Robert Speicher	2018-03-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the other "A copy of ..." error for ReadOnly Closes #44365 See merge request gitlab-org/gitlab-ce!17935
\| * \| \| \| \| \| \|	Force Rails to not complain about reloading	Lin Jen-Shin	2018-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Same strategy with: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17810 See: https://stackoverflow.com/a/29710188/1992201 Frankly I don't really understand how this works and I don't really care either. However I tried it and it does the job. To try this, make sure you have pending migrations, and run the server, hit the site. It would tell you that there's pending migrations, and then run migrations, and then hit the site again. Without this patch, Rails would complain that "A copy of ...", with this patch, it works without problems.
* \| \| \| \| \| \| \|	Merge branch 'robots-help' into 'master'	Robert Speicher	2018-03-22	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the /help page in robots.txt Closes #44433 See merge request gitlab-org/gitlab-ce!17928
\| * \| \| \| \| \| \| \|	Add the /help page in robots.txtrobots-help	Achilleas Pipinellis	2018-03-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The /help page has docs which we don't want to be crawled as we prefer the docs website instead. Related https://gitlab.com/gitlab-org/gitlab-ce/issues/44433
* \| \| \| \| \| \| \| \|	Merge branch 'bw-tweak-migration-style-guide-docs' into 'master'	Robert Speicher	2018-03-22	1	-4/+12
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make a little more obvious what operations might need downtime or enhanced migration techniques See merge request gitlab-org/gitlab-ce!17927
\| * \| \| \| \| \| \| \|	make a little more obvious what operations might need downtime or enhanced ↵	Brett Walker	2018-03-22	1	-4/+12
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration techniques
* \| \| \| \| \| \| \|	Merge branch '44386-better-ux-for-long-name-branches' into 'master'	Phil Hughes	2018-03-22	3	-72/+95
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Poor UX with branch whose name is very long on Branches Closes #44386 See merge request gitlab-org/gitlab-ce!17832
\| * \| \| \| \| \| \| \|	UX re-design branch items with flexbox	Takuya Noguchi	2018-03-22	3	-72/+95
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'backport-4006-add-weight-indicator-to-issues-board' into 'master'	Clement Ho	2018-03-22	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 4006 add weight indicator to issues board See merge request gitlab-org/gitlab-ce!17923
\| * \| \| \| \| \| \| \| \|	backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-board	Dennis Tang	2018-03-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2018-03-22	4	-25/+40
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'leipert-42037-long-instance-names-group-names-covers-namespace-dropdown' into 'master' Prevent overflow of long instance urls during Project creation Closes #42037 See merge request gitlab-org/gitlab-ce!17717
\| * \| \| \| \| \| \| \| \| \|	Prevent overflow of long instance urls during Project creation	Lukas Eipert	2018-03-22	4	-25/+40
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'latest-security-to-master-21-03-18' into 'master'	Douwe Maan	2018-03-22	48	-135/+543
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce latest security changes to `master` See merge request gitlab-org/gitlab-ce!17905
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into 'latest-security-to-master-21-03-18'	James Lopez	2018-03-22	219	-1250/+2797
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \| \| \| \| \| \| \| \| \| \|	Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18	Francisco Javier López	2018-03-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Adapting mattermost to the new way of calling HTTP	Francisco Javier López	2018-03-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'	James Lopez	2018-03-21	9	-55/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'	Douwe Maan	2018-03-21	39	-79/+408
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '44453-performance-bar-modalbox' into 'master'	Phil Hughes	2018-03-22	3	-2/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Performance bar modal box content overflows" Closes #44453 See merge request gitlab-org/gitlab-ce!17889