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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵	Kieran Andrews	2019-04-03	2	-3/+9
\| \| \| \|	into feature/webide_escaping
*	Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'	Rémy Coutable	2019-04-03	1	-12/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Only execute system hooks once when pushing tags Closes #52560 See merge request gitlab-org/gitlab-ce!26888
\| *	Only execute system hooks once when pushing tags	Nick Thomas	2019-04-03	1	-12/+0
\| \|
* \|	Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'	Rémy Coutable	2019-04-03	1	-9/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show system notes on commits in the MR page Closes #55268 See merge request gitlab-org/gitlab-ce!26396
\| * \|	Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mr	Heinrich Lee Yu	2019-04-02	1	-9/+10
\| \| \|
* \| \|	Merge branch ↵	Sean McGivern	2019-04-03	1	-3/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label' into 'master' Resolve "Quick Action Adds Multiple Labels to Issue If Middle Words Overlap with Existing Label" Closes #53459 See merge request gitlab-org/gitlab-ce!26602
\| * \| \|	Fix quick actions add label name middle word overlaps53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label	Jacopo	2019-04-02	1	-3/+16
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes quick actions add label when adding a label which name middle word overlaps with another label name: for example adding "A B C" when also label "B" exists. With the fix only the label "A B C" is correctly added, previously also the label "B" was added due to the middle word overlaps.
* \| \|	Extend timezone dropdown	Ezekiel Kigbo	2019-04-03	2	-26/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds optional paramters to the constructor to allow reuse of the timezone dropdown on other pages
* \| \|	Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'	Filipa Lacerda	2019-04-03	1	-4/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
\| * \| \|	Fixes duplicate diff too large error messages	Phil Hughes	2019-04-02	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* \| \| \|	Merge branch '47771-highlighting-in-diff' into 'master'	Tim Zallmann	2019-04-03	1	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enabled text selection in diffs in Web IDE Closes #47771 See merge request gitlab-org/gitlab-ce!26721
\| * \| \| \|	Enabled text selection in diffs in Web IDE47771-highlighting-in-diff	Denys Mishunov	2019-03-28	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/47771 Changelog entry
* \| \| \| \|	Merge branch 'patch-49' into 'master'	Phil Hughes	2019-04-03	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comment typo in noteable_note.vue See merge request gitlab-org/gitlab-ce!26855
\| * \| \| \|	Fix comment typo	Sergiu Marton	2019-04-02	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into ↵	Mike Greiling	2019-04-02	2	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Set the size of instance system message text 12px" Closes #59131 See merge request gitlab-org/gitlab-ce!26293
\| * \| \| \| \|	Remove duplicate declaration of $system-header-height59131-set-the-size-of-instance-system-message-text-12px	Dennis Tang	2019-04-02	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Update system message banner font size to 12px	Dennis Tang	2019-04-02	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Remove non-functional add issue button on welcome list	Donald Cook	2019-04-02	2	-2/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"	Jan Provaznik	2019-04-02	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26569
* \| \| \| \| \|	Remove ignore column for PersonalAccessToken#token	Imre Farkas	2019-04-02	1	-2/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-8317-operations-dashboard-usage-ping' into 'master'	Douglas Barbosa Alexandre	2019-04-02	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dashboard scope for operations dashboard usage ping See merge request gitlab-org/gitlab-ce!26727
\| * \| \| \| \|	Add with_dashboard scope to Userce-8317-operations-dashboard-usage-ping	Logan King	2019-03-22	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-cache-pipeline-find-commits' into 'master'	Kamil Trzciński	2019-04-02	1	-4/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache FindCommit results in pipelines view See merge request gitlab-org/gitlab-ce!26776
\| * \| \| \| \| \|	Cache FindCommit results in pipelines viewsh-cache-pipeline-find-commits	Stan Hu	2019-04-02	1	-4/+10
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each pipeline, the controller will call `Pipeline#latest?` to determine if the pipeline's ref is the latest for that branch. Since it's likely that the same branches are being used in each pipeline, we can reduce Gitaly overhead by caching the results of the FindCommit call.
* \| \| \| \| \|	Stop calling UnlinkRepositoryFromObjectPool RPC	Jacob Vosmaer	2019-04-02	2	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	13	-26/+129
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	13	-26/+129
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jarv/dev-to-gitlab-2019-04-02
\| \| * \ \ \ \	Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2977
\| \| \| * \| \| \| \|	Fix XSS in resolve conflicts form	Paul Slaughter	2019-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+7
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-7/+35
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-7/+35
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PDF.js vulnerability See merge request gitlab/gitlabhq!2999
\| \| \| * \| \| \| \| \| \| \|	fix: changed PDFJS prop to GlobalWorkerOptions	Natalia Tepluhina	2019-03-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'security-milestone-labels' into 'master'	GitLab Release Tools Bot	2019-04-02	3	-8/+76
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	3	-8/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	1	-5/+8
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3028
\| \| \| * \| \| \| \| \| \| \| \| \|	Add cr remarks	Małgorzata Ksionek	2019-03-25	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Disallow changing namespace of a project in update method	Małgorzata Ksionek	2019-03-20	1	-5/+8
\| \| \| \| \|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Disallow guest users from accessing Releases	Shinya Maeda	2019-03-26	1	-1/+1
\| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As they do not have a permission to read git tag
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'expose-mr-pipeline-parameters-for-merge-widget-ce' into 'master'	Kamil Trzciński	2019-04-02	3	-8/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \| \| \| \|	Backport splitting approval changes from CE	Igor	2019-04-02	2	-8/+4
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Author and committers approvals are split in EE This commit provides backports for those changes This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-expand-full-file-on-image' into 'master'	Douwe Maan	2019-04-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59695
* \| \| \| \| \| \| \| \| \| \| \|	Monitor GraphQL with Prometheus	Jan Provaznik	2019-04-02	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-7/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of design-management-upload-client See merge request gitlab-org/gitlab-ce!26766