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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Check that feature database and table exists for gitaly featuresjc-feature-flag-find-all-tags	John Cai	2019-03-06	1	-1/+3
\|
*	Add feature flag for FindAllTags	John Cai	2019-03-05	1	-1/+1
\|
*	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
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Modify MergeRequestsFinder to allow filtering by commit	Patrick Bajao	2019-01-28	4	-4/+45
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Respond with 403 when non-member requests for private MRs	Patrick Bajao	2019-01-28	2	-2/+15
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'security-id-restricted-access-to-private-repo' into 'master'	Yorick Peterse	2019-03-04	5	-60/+137
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forbid creating discussions for users with restricted access Closes #2788 See merge request gitlab/gitlabhq!2868
\| \| \| * \| \| \| \|	Forbid creating discussions for users with restricted access	Igor Drozdov	2019-03-04	5	-60/+137
\| \| \|/ / / / /
\| \| * \| \| \| \|	Merge branch 'security-protect-private-repo-information' into 'master'	Yorick Peterse	2019-03-04	6	-22/+85
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix leaking private repository information in API See merge request gitlab/gitlabhq!2881
\| \| \| * \| \| \| \|	Add changelog entry	Luke Duncalfe	2019-02-21	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Removing sensitive properties from ProjectType	Luke Duncalfe	2019-02-18	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	defaultBranch and ciConfigPath should only be available to users with the :download_code permission for the Project, as the respository might be private. When implementing the authorize check on these properties, it was found that our current Graphql::Authorize::Instrumentation class does not work with fields that resolve to subclasses of GraphQL::Schema::Scalar, like GraphQL::STRING_TYPE. After discussion with other Create Team members, it has been decided that because the GraphQL API is not GA, to remove these properties from ProjectType, and instead implement them as part of epic https://gitlab.com/groups/gitlab-org/-/epics/711 Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/55316
\| \| \| * \| \| \| \|	Prevent leaking of private repo data through API	Luke Duncalfe	2019-02-18	4	-20/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default_branch, statistics and config_ci_path are now only exposed if the user has permissions to the repository.
\| \| * \| \| \| \| \|	Merge branch 'security-tags-oracle' into 'master'	Yorick Peterse	2019-03-04	3	-0/+23
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Releases links API to leak tag existence Closes #2795 See merge request gitlab/gitlabhq!2893
\| \| \| * \| \| \| \| \|	Prevent Releases links API to leak tag existance	Alessio Caiazza	2019-02-08	3	-0/+23
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'security-2798-fix-boards-policy' into 'master'	Yorick Peterse	2019-03-04	3	-8/+19
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable issue board policies when issues are disabled Closes #2798 See merge request gitlab/gitlabhq!2894