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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix labelspatch-47	Victor Wu	2019-03-05	1	-10/+10
\|
*	Update Feature proposal.md	Mark Pundsack	2019-03-05	1	-0/+7
\|
*	Add group and DevOps labels for easy access during issue creation.	Mark Pundsack	2019-03-05	1	-0/+13
\|
*	Merge branch ↵	Filipa Lacerda	2019-03-05	13	-17/+392
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'27333-re-deploy-rollback-button-should-ask-for-confirmation-before-executing' into 'master' Ask for confirmation before re-deploying/rolling back Closes #27333 See merge request gitlab-org/gitlab-ce!25110
\| *	Add Component to Confirm Environment Rollback	Andrew Fontaine	2019-03-05	13	-17/+392
\|/ \| \| \| \| \| \| \| \|	Ensure a vue.js component to confirm the re-deployment/rollback of an environment pops up when rollback/re-deploy has been clicked so the user must confirm their actions before accidentally rolling back or re-deploying an environment. Only on the `environment-table` view.
*	Merge branch '56851-error-tracking-page-seems-broken' into 'master'	Filipa Lacerda	2019-03-05	5	-14/+62
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Error tracking page seems broken" Closes #56851 See merge request gitlab-org/gitlab-ce!24806
\| *	Fix error tracking page, not showing an empty state	Jose Vargas	2019-03-01	5	-14/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds a missing empty state for when a backend response contains an empty error list, it shows the table but with `no data to display` empty state, also adds a reload button that allows to refresh for data
* \|	Merge branch ↵	Filipa Lacerda	2019-03-05	4	-14/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32714-copying-comment-with-ordered-list-includes-extraneous-newlines' into 'master' Resolve "Copying comment with ordered list includes extraneous newlines" Closes #32714 See merge request gitlab-org/gitlab-ce!25695
\| * \|	Added tightLists option to copy_as_gfm markdown serializer	Constance Okoghenun	2019-03-05	4	-14/+10
\|/ / \| \| \| \| \| \| \| \|	This removes extraneous newlines when copying comments with an ordered list.
* \|	Merge branch 'add-efs-warning-to-requirements' into 'master'	Mike Lewis	2019-03-05	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Adding EFS warning to requirements See merge request gitlab-org/gitlab-ce!25754
\| * \|	Adding NFS warning to requirements	Eric Johnson	2019-03-05	1	-0/+2
\| \| \|
* \| \|	Merge branch 'check_pg_stat_activity' into 'master'	Stan Hu	2019-03-05	1	-0/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show pg_stat_activity before each test run See merge request gitlab-org/gitlab-ce!25723
\| * \| \|	Show pg_stat_activity before each test run	Thong Kuah	2019-03-05	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Maybe this will help us debug https://gitlab.com/gitlab-org/gitlab-ee/issues/10154
* \| \| \|	Merge branch '56809-graphql-version-api' into 'master'	Douwe Maan	2019-03-05	14	-5/+171
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metadata about the GitLab server to GraphQL See merge request gitlab-org/gitlab-ce!24636
\| * \| \| \|	Apply suggestion to spec/graphql/types/query_type_spec.rb	Douwe Maan	2019-03-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add metadata about the GitLab server to GraphQL	Nick Thomas	2019-03-05	14	-5/+171
\| \| \| \| \|
* \| \| \| \|	Merge branch '58390-jest-coverage-analysis-is-failing-on-master' into 'master'	Filipa Lacerda	2019-03-05	3	-0/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-add babel plugins for dynamic imports Closes #58390 See merge request gitlab-org/gitlab-ce!25763
\| * \| \| \| \|	Re-add babel plugins for dynamic imports	Lukas Eipert	2019-03-05	3	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25597 we also removed the babel-plugin-dynamic-import-node. It is now throwing errors when we run jest with coverage.
* \| \| \| \| \|	Merge branch 'security-id-fix-mr-visibility' into 'master'	Yorick Peterse	2019-03-05	7	-213/+335
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display the correct number of MRs a user has access to Closes #2790 See merge request gitlab/gitlabhq!2880
\| * \| \| \| \|	Display the correct number of MRs a user has access to	Igor Drozdov	2019-03-05	7	-213/+335
\|/ / / / /
* \| \| \| \|	Merge branch 'enable-markup-highlighting' into 'master'	Douwe Maan	2019-03-05	2	-1/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SyntaxHighlightFilter to markup pipeline Closes #20023 See merge request gitlab-org/gitlab-ce!25761
\| * \| \| \| \|	Add SyntaxHighlightFilter to markup pipeline	Martin Wortschack	2019-03-05	2	-1/+7
\|/ / / / /
* \| \| \| \|	Merge branch 'winh-revert-34293b5af83' into 'master'	Kushal Pandya	2019-03-05	3	-44/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'gitlab-ui-visual' into 'master'" See merge request gitlab-org/gitlab-ce!25764
\| * \| \| \| \|	Revert "Merge branch 'gitlab-ui-visual' into 'master'"	Winnie Hellmann	2019-03-05	3	-44/+11
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 34293b5af83af03e8c814f488be8c31e37ff5be3, reversing changes made to fdcfae2a92ac105d458e6f9617c1f22229ef34b6. Conflicts: .gitlab-ci.yml
* \| \| \| \|	Merge branch 'add_ldap_tls_options' into 'master'	Douwe Maan	2019-03-05	8	-53/+307
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow raw `tls_options` to be passed in LDAP configuration Closes #46391 See merge request gitlab-org/gitlab-ce!20678
\| * \| \| \| \|	Allow raw `tls_options` to be passed in LDAP configuration	Drew Blessing	2019-03-04	8	-53/+307
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
* \| \| \| \| \|	Merge branch 'docs-anchors8-dev' into 'master'	Marcia Ramos	2019-03-05	11	-37/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix broken anchors in development docs See merge request gitlab-org/gitlab-ce!25596
\| * \| \| \| \| \|	Docs: Fix broken anchors in development docs	Marcel Amirault	2019-03-05	11	-37/+24
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-anchors10-user' into 'master'	Marcia Ramos	2019-03-05	16	-26/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix all anchors in /user docs See merge request gitlab-org/gitlab-ce!25705
\| * \| \| \| \| \|	Docs: Fix all anchors in /user docs	Marcel Amirault	2019-03-05	16	-26/+26
\|/ / / / / /
* \| \| \| \| \|	Merge branch '58529-fix-specs' into 'master'	Rémy Coutable	2019-03-05	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken master - Make sure issue and milestone projects are same Closes #58529 See merge request gitlab-org/gitlab-ce!25767
\| * \| \| \| \| \|	Make sure MR and milestone projects are same	Jarka Košanová	2019-03-05	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge dev.gitlab.org master into GitLab.com master	Yorick Peterse	2019-03-05	4	-4/+112
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'security-2774-milestones-detail' into 'master'	Yorick Peterse	2019-03-05	4	-4/+112
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display only information visible to current user on Milestone detail See merge request gitlab/gitlabhq!2803
\| \| * \| \| \| \| \| \|	Display only informaton visible to current user	Jarka Košanová	2019-03-05	4	-4/+112
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display only labels and assignees of issues visible by the currently logged user Display only issues visible to user in the burndown chart
* \| \| \| \| \| \| \|	Merge branch 'table-fix-scroll-and-block' into 'master'	Annabel Dunstone Gray	2019-03-05	2	-6/+6
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix large table horizontal scroll and prevent side-by-side tables Closes #44014 See merge request gitlab-org/gitlab-ce!25520
\| * \| \| \| \| \| \|	Fix large table horizontal scroll and prevent side-by-side tables	Dany Jupille	2019-03-05	2	-6/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'revert-2dcbc0fa' into 'master'	Phil Hughes	2019-03-05	4	-134/+85
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'" See merge request gitlab-org/gitlab-ce!25762
\| * \| \| \| \| \| \|	Revert "Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'"	Winnie Hellmann	2019-03-05	4	-134/+85
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !25542
* \| \| \| \| \| \|	Merge branch 'merge-dev-to-master' into 'master'	John Jarvis	2019-03-05	131	-448/+1571
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge dev.gitlab.org master into GitLab.com master Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787 See merge request gitlab-org/gitlab-ce!25746
\| * \| \| \| \| \| \|	Resolve conflicts in group policy	Małgorzata Ksionek	2019-03-05	2	-3/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add frozen_string_literal to new files	Stan Hu	2019-03-04	3	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Resolve conflicts in spec/policies/group_policy_spec.rb	Stan Hu	2019-03-04	1	-12/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Resolve conflicts in spec/mailers/notify_spec.rb	Stan Hu	2019-03-04	1	-10/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Resolve conflicts in app/policies/group_policy.rb	Stan Hu	2019-03-04	1	-3/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge dev master into GitLab.com master	Yorick Peterse	2019-03-04	131	-434/+1577
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge branch 'security-2773-milestones-fix' into 'master'	Yorick Peterse	2019-03-04	19	-73/+187
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Check issue milestone availability See merge request gitlab/gitlabhq!2788
\| \| \| * \| \| \| \| \|	Check issue milestone availability	Jarka Košanová	2019-02-14	19	-73/+187
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project when creating milestone in specs We validate milestone is from the same project/parent group as issuable -> we need to set project in specs correctly Improve methods names and specs organization
\| \| * \| \| \| \| \| \|	Merge branch 'security-commit-private-related-mr' into 'master'	Yorick Peterse	2019-03-04	6	-6/+65
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow non-members to see private related MRs Closes #2787 See merge request gitlab/gitlabhq!2866
\| \| \| * \| \| \| \| \| \|	Add changelog for security fix	Patrick Bajao	2019-01-28	1	-0/+5
\| \| \| \| \| \| \| \| \| \|