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	1	-2/+4
\| \| \| \|	into feature/webide_escaping
*	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
\| \| \| \|
* \| \| \|	Merge branch 'jarv/dev-to-gitlab-2019-04-02' into 'master'	Robert Speicher	2019-04-02	2	-2/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jarv/dev-to-gitlab-2019-04-02
\| \| * \ \	Merge branch 'security-56224' into 'master'	GitLab Release Tools Bot	2019-04-02	1	-1/+3
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guest user of a project should not see branches
\| \| * \| \| \|	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 '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
* \| \| \| \| \|	CE backport of design-management-upload-client	Phil Hughes	2019-04-02	1	-7/+12
\|/ / / / /
* \| \| \| \|	Merge branch 'nfriend-css-updates-for-gitlab-design-system-compliance' into ↵	Fatih Acet	2019-04-01	2	-2/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update border radius of form controls and remove space above page titles See merge request gitlab-org/gitlab-ce!24497
\| * \| \| \| \|	Update border radius of form controls and remove space above page titlesnfriend-css-updates-for-gitlab-design-system-compliance	Nathan Friend	2019-02-14	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit makes changes to global CSS styles to bring the product closer to compliance with Pajamas (the GitLab design system).
* \| \| \| \| \|	Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'	Clement Ho	2019-04-01	3	-23/+62
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where clicking file header in diff refreshes page Closes #57669 See merge request gitlab-org/gitlab-ce!26422
\| * \| \| \| \| \|	Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-page	Sam Bigelow	2019-03-29	3	-23/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add an ID to the diff content - handle clicking on file name in diffFileHeader when it is not a link to another page but rather a link to an element on the page
* \| \| \| \| \| \|	Merge branch '59694-markdown-area' into 'master'	Phil Hughes	2019-04-01	2	-5/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styleling for `app/assets/stylesheets/framework/markdown_area.scss` See merge request gitlab-org/gitlab-ce!26768
\| * \| \| \| \| \| \|	Replaces md-area with position-relative for markdown areas	Filipa Lacerda	2019-04-01	2	-5/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove executable permission on imagessh-fix-image-permissions	Stan Hu	2019-03-30	3	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/187433314
* \| \| \| \| \| \| \|	Merge branch 'dennis-positioning-important' into 'master'	Clement Ho	2019-03-29	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Designate common positioning classes as `!important` a la Bootstrap See merge request gitlab-org/gitlab-ce!26621
\| * \| \| \| \| \| \| \|	Designate common positioning classes as important a la Bootstrapdennis-positioning-important	Dennis Tang	2019-03-26	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Handle missing keys in sentry api response	Reuben Pereira	2019-03-29	1	-1/+1
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Do not raise error when there are missing non-essential keys in sentry api response. - Add specs for to check for missing keys behavior.
* \| \| \| \| \| \| \|	Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master'	Nick Thomas	2019-03-29	3	-0/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of 1607-elastic_feature_flag_per_group See merge request gitlab-org/gitlab-ce!25825
\| * \| \| \| \| \| \| \|	Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_group	Mario de la Ossa	2019-03-28	3	-0/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Adds EE validators to CE file	Sarah Groff Hennigh-Palermo	2019-03-29	1	-0/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add requested resources to cluster health - ce port	Tristan Read	2019-03-29	2	-6/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Don't cutoff letters in MR and Issue links	gfyoung	2019-03-28	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '24936-remove-type-from-review-app-name' into 'master'	Mike Greiling	2019-03-28	1	-10/+19
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant group name from environment name on the "Environments" page Closes #24936 See merge request gitlab-org/gitlab-ce!25600
\| * \| \| \| \| \| \| \|	Remove folder from environment name	Nathan Friend	2019-03-18	1	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this commit, environments grouped together in a "folder" would include the folder name in the UI. This information was unnecessary since the folder is also shown in the UI. In addition, this commit also makes some minor changes to how tooltips are displayed for both environments and folders.
* \| \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-03-28	1	-13/+35
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master' Remove EE differences for monitoring dashboard See merge request gitlab-org/gitlab-ce!26574
\| * \| \| \| \| \| \| \| \|	Remove EE differences for monitoring dashboard	Simon Knox	2019-03-27	1	-13/+35
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '59079-fix-jupyter-render-loop' into 'master'	Phil Hughes	2019-03-28	1	-14/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix jupyter rendering bug that ended in an infinite loop Closes #59079 See merge request gitlab-org/gitlab-ce!26667
\| * \| \| \| \| \| \| \| \| \|	Fix jupyter rendering bug that ended in an infinite loop	ROSPARS Benoit	2019-03-27	1	-14/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '10518-boards-css' into 'master'	Phil Hughes	2019-03-28	1	-1/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for boards.scss Closes gitlab-ee#10518 See merge request gitlab-org/gitlab-ce!26647
\| * \| \| \| \| \| \| \| \| \| \|	Removes EE differences for boards.scss	Filipa Lacerda	2019-03-27	1	-1/+16
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '13784-validate-variables-for-masking' into 'master'"	Kamil Trzciński	2019-03-27	2	-33/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !25476
* \| \| \| \| \| \| \| \| \| \|	Upgraded Vue to 2.6.8	Tim Zallmann	2019-03-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade to latest Version
* \| \| \| \| \| \| \| \| \| \|	Scaffold UI elements for minimal version	Miranda Fluharty	2019-03-27	2	-2/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a masked switch to variable rows Copy some behavior from the protected switch
* \| \| \| \| \| \| \| \| \| \|	Disable icons in bootstrap form validation	Lukas Eipert	2019-03-27	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/design.gitlab.com/issues/242
* \| \| \| \| \| \| \| \| \| \|	Whitelist additional elements and attributes	Lukas Eipert	2019-03-27	1	-0/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bootstrap 4.3.1 introduced sanitation for HTML popovers / tooltips. The rules are rather strict, so we extend the default whitelists with safe attributes / tags.
* \| \| \| \| \| \| \| \| \| \|	Update bootstrap to 4.3.1	Lukas Eipert	2019-03-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|