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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'docs-image-realignment' into 'master'11-10-stable-prepare-rc1	Achilleas Pipinellis	2019-04-02	35	-0/+0
\|\ \| \| \| \| \| \| \| \|	Docs: image realignment See merge request gitlab-org/gitlab-ce!26799
\| *	Docs: image realignment	Marcel Amirault	2019-04-02	35	-0/+0
\|/
*	Merge branch 'docs-move-variables-ref-to-new-doc' into 'master'	Achilleas Pipinellis	2019-04-02	2	-101/+111
\|\ \| \| \| \| \| \| \| \|	Docs: move variables reference to its own doc See merge request gitlab-org/gitlab-ce!26763
\| *	Fix conflicts with master	Marcia Ramos	2019-04-02	2	-101/+111
\|/ \| \| \|	Pull master
*	Merge branch 'jv-gitaly-unlink-repository' into 'master'	Grzegorz Bizon	2019-04-02	5	-19/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Stop calling UnlinkRepositoryFromObjectPool RPC Closes #59777 See merge request gitlab-org/gitlab-ce!26821
\| *	Stop calling UnlinkRepositoryFromObjectPool RPC	Jacob Vosmaer	2019-04-02	5	-19/+6
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59777. In earlier iterations of our implementation of Git object deduplication we thought we would be making extensive use of Git remotes in pool repositories in the future, and that we should manage these remotes carefully from the start. We now expect we only care about one remote, namely the source project. The other remotes are there only for forensic purposes. Before this MR we tried to also remove pool remotes when member projects got deleted, with the UnlinkRepositoryFromObjectPool RPC. This is fragile when there are race conditions (see https://gitlab.com/gitlab-org/gitaly/issues/1568#note_153955926). We have spent some time making this RPC less fragile in https://gitlab.com/gitlab-org/gitaly/merge_requests/1151 but looking at this problem again, I think we should just stop calling it.
*	Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'	Robert Speicher	2019-04-02	63	-32302/+52008
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Jarv/dev to gitlab 2019 04 02 Closes #2810 See merge request gitlab-org/gitlab-ce!26846
\| *	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02	John Jarvis	2019-04-02	63	-32302/+52008
\| \|\ \| \| \| \| \| \| \| \| \|	jarv/dev-to-gitlab-2019-04-02
\| \| *	Merge branch 'security-exif-migration' into 'master'	GitLab Release Tools Bot	2019-04-02	7	-1/+363
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rake task for removing exif from uploads Closes #2810 See merge request gitlab/gitlabhq!2922
\| \| \| *	Rake task for removing exif from uploads	Jan Provaznik	2019-04-02	7	-1/+363
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Adds a rake task which can be used for removing EXIF data from existing uploads.
\| \| *	Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'	GitLab Release Tools Bot	2019-04-02	3	-1/+21
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2977
\| \| \| *	Fix XSS in resolve conflicts form	Paul Slaughter	2019-03-07	3	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
\| \| * \|	Merge branch 'security-56224' into 'master'	GitLab Release Tools Bot	2019-04-02	5	-4/+47
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!2996
\| \| \| * \|	Hide related branches when user does not have permission	Mark Chao	2019-03-21	5	-4/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guest user of a project should not see branches
\| \| * \| \|	Merge branch 'security-id-potential-denial-languages' into 'master'	GitLab Release Tools Bot	2019-04-02	13	-18/+130
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return cached languages if they've been detected before See merge request gitlab/gitlabhq!2998
\| \| \| * \| \|	Return cached languages if they've been detected before	Igor Drozdov	2019-03-20	13	-18/+130
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'	GitLab Release Tools Bot	2019-04-02	8	-32169/+50870
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PDF.js vulnerability See merge request gitlab/gitlabhq!2999
\| \| \| * \| \| \|	Added changelog entry	Natalia Tepluhina	2019-03-19	1	-0/+5
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Fixed pdf tests	Natalia Tepluhina	2019-03-13	2	-3/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	fix: changed PDFJS prop to GlobalWorkerOptions	Natalia Tepluhina	2019-03-13	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Updated PDF.js to 2.0.943	Natalia Tepluhina	2019-03-12	4	-32165/+50861
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'security-use-untrusted-regexp' into 'master'	GitLab Release Tools Bot	2019-04-02	15	-96/+198
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use UntrustedRegexp for CI refs matching See merge request gitlab/gitlabhq!3005
\| \| \| * \| \| \| \|	Make CI refs matching to to use UntrustedRegexp	Kamil Trzciński	2019-03-15	15	-96/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
\| \| * \| \| \| \| \|	Merge branch 'security-milestone-labels' into 'master'	GitLab Release Tools Bot	2019-04-02	4	-8/+162
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Check label_ids parent when updating issue board See merge request gitlab/gitlabhq!3027
\| \| \| * \| \| \| \| \|	Check if labels are available for target issuable	Jarka Košanová	2019-03-28	4	-8/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- labels have to be in the same project/group as an issuable
\| \| * \| \| \| \| \| \|	Merge branch 'security-mass-assignment-on-project-update' into 'master'	GitLab Release Tools Bot	2019-04-02	3	-5/+30
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3028
\| \| \| * \| \| \| \| \| \|	Refactor specs according to the code review	Małgorzata Ksionek	2019-03-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Add cr remarks	Małgorzata Ksionek	2019-03-25	3	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Disallow changing namespace of a project in update method	Małgorzata Ksionek	2019-03-20	3	-5/+30
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'security-disallow-guests-to-access-releases' into 'master'	GitLab Release Tools Bot	2019-04-02	4	-3/+46
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow guest users from accessing Releases See merge request gitlab/gitlabhq!3041
\| \| \| * \| \| \| \| \| \|	Disallow guest users from accessing Releases	Shinya Maeda	2019-03-26	4	-3/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As they do not have a permission to read git tag
\| \| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 11.7.10	GitLab Release Tools Bot	2019-03-28	1	-0/+13
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \|	Update CHANGELOG.md for 11.9.3	GitLab Release Tools Bot	2019-03-27	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \|	Update CHANGELOG.md for 11.7.8	GitLab Release Tools Bot	2019-03-26	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \|	Update CHANGELOG.md for 11.9.2	GitLab Release Tools Bot	2019-03-26	1	-0/+14
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'qa/document_click_vs_go_to' into 'master'	Rémy Coutable	2019-04-02	2	-0/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document `click_` vs. `go_to_` standard for e2e tests Closes #59645 See merge request gitlab-org/gitlab-ce!26825
\| * \| \| \| \| \| \| \|	Document click_ vs. go_to_ standard for e2e testsqa/document_click_vs_go_to	Walmyr Lima	2019-04-01	2	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59645.
* \| \| \| \| \| \| \| \|	Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'	Kamil Trzciński	2019-04-02	6	-50/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Expose merge request pipeline parameters for MR widget See merge request gitlab-org/gitlab-ce!26826
\| * \| \| \| \| \| \| \| \|	Backport EE changeexpose-mr-pipeline-parameters-for-merge-widget-ce	Shinya Maeda	2019-04-02	6	-50/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for merge request pipelines
* \| \| \| \| \| \| \| \| \|	Merge branch 'diff-tree-mobile-bug' into 'master'	Filipa Lacerda	2019-04-02	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed positioning of the diff tree list on mobile Closes #59739 See merge request gitlab-org/gitlab-ce!26820
\| * \| \| \| \| \| \| \| \| \|	Fixed positioning of the diff tree list on mobile	Phil Hughes	2019-04-02	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59739
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'id-split-self-approval-restrictions' into 'master'	Nick Thomas	2019-04-02	4	-36/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport splitting approval changes from CE See merge request gitlab-org/gitlab-ce!26323
\| * \| \| \| \| \| \| \| \| \| \|	Backport splitting approval changes from CE	Igor	2019-04-02	4	-36/+17
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Author and committers approvals are split in EE This commit provides backports for those changes This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-css' into 'master'	Phil Hughes	2019-04-02	1	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds documentation about the utility classes See merge request gitlab-org/gitlab-ce!26824
\| * \| \| \| \| \| \| \| \| \| \|	Adds documentation about the utility classes	Filipa Lacerda	2019-04-02	1	-0/+9
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-expand-full-file-on-image' into 'master'	Douwe Maan	2019-04-02	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed expand full file button showing on images Closes #59695 See merge request gitlab-org/gitlab-ce!26830
\| * \| \| \| \| \| \| \| \| \| \|	Fixed expand full file button showing on images	Phil Hughes	2019-04-01	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59695
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-graphql-prometheus' into 'master'	Dmitriy Zaporozhets	2019-04-02	4	-0/+84
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Monitor GraphQL with Prometheus See merge request gitlab-org/gitlab-ce!26569
\| * \| \| \| \| \| \| \| \| \| \| \|	Monitor GraphQL with Prometheus	Jan Provaznik	2019-04-02	4	-0/+84
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extends graphql's platform tracing class to observe duration of graphql methods. In graphql 1.8.11 is added prometheus class but it's not very useful for us because it uses prometheus_exporter to export results.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'design-management-upload-client-ce' into 'master'	Filipa Lacerda	2019-04-02	4	-54/+81
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of design-management-upload-client See merge request gitlab-org/gitlab-ce!26766