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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Merge branch 'graphql-tree-last-commit' into 'master'	Lin Jen-Shin	2019-06-28	1	-0/+25
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added commit type to tree GraphQL type See merge request gitlab-org/gitlab-ce!29412
\| \| * \| \| \| \| \| \|	Added commit type to tree GraphQL type	Phil Hughes	2019-06-28	1	-0/+25
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '63212-n-1-queries-in-projects-id-boards-api' into 'master'	Thong Kuah	2019-06-28	4	-4/+4
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 queries in boards API See merge request gitlab-org/gitlab-ce!29634
\| \| * \| \| \| \| \| \|	Remove N+1 query for project and group boards	charlieablett	2019-06-26	4	-4/+4
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add test for N+1 queries - Add destroyable lists scope to Board and List - Preload lists for both project and group boards
\| * \| \| \| \| \| \|	Merge branch '62826-graphql-emoji-mutations' into 'master'	Jan Provaznik	2019-06-28	2	-0/+22
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GraphQL mutations for add, remove and toggle emoji See merge request gitlab-org/gitlab-ce!29919
\| \| * \| \| \| \| \|	GraphQL mutations for add, remove and toggle emoji62826-graphql-emoji-mutations	Luke Duncalfe	2019-06-28	2	-0/+22
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding new `AddAwardEmoji`, `RemoveAwardEmoji` and `ToggleAwardEmoji` GraphQL mutations. Adding new `#authorized_find_with_pre_checks!` and (unused, but for completeness `#authorized_find_with_post_checks!`) authorization methods. These allow us to perform an authorized find, and run our own additional checks before or after the authorization runs. https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
\| * \| \| \| \| \|	Support jsonb Default Value in add_column_with_default Migration Helper	Jason Goodman	2019-06-28	1	-1/+2
\| \|/ / / / /
\| * \| \| \| \|	Add support for creating random passwords in user creation APIsh-add-force-random-password-user-api	Stan Hu	2019-06-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid having to specify an actual password to create users, admins can now use the `force_random_password` parameter to let Devise generate a password. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63826
\| * \| \| \| \|	Change GetRawChanges RPC to use bytes	Paul Okstad	2019-06-27	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add permission check to dashboards	Sarah Yasonik	2019-06-27	1	-0/+8
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds permission checks to the metrics_dashboard endpoint. Users with role of Reporter or above should have access to view the metrics for a given project.
* \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2019-07-03	10	-16/+130
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Merge branch 'security-mr-head-pipeline-leak' into 'master'	Marin Jankovski	2019-07-02	1	-1/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix MR head pipeline leak See merge request gitlab/gitlabhq!3148
\| \| * \| \| \|	Gate MR head_pipeline behind read_pipeline ability	Matija Čupić	2019-06-08	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Prevent Billion Laughs attack	Fabio Pitino	2019-07-02	3	-4/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It keeps track of the memory being used when loading the YAML file as well as the depth of nesting. Track exception when YAML is too big
\| * \| \| \| \|	Merge branch 'security-DOS_issue_comments_banzai' into 'master'	Marin Jankovski	2019-07-02	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix DOS when rendering issue/MR comments See merge request gitlab/gitlabhq!3152
\| \| * \| \| \| \|	Fix DOS when rendering issue/MR comments	Mario de la Ossa	2019-06-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'security-bvl-enforce-graphql-type-authorization' into 'master'	Marin Jankovski	2019-07-02	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix type authorizations in GraphQL See merge request gitlab/gitlabhq!3170
\| \| * \| \| \| \| \|	Enforce authorizations for non-nullable fields	Bob Van Landuyt	2019-06-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure we also enforce authorizations for non-nullable fields. We are defining our authorizations on the unwrapped types (Repository). But when a type like that is presented in a non-nullable field, it's type is different (Repository!). The non-nullable type would not have the authorization metadata. This makes sure we check the metadata on the unwrapped type for finding authorizations.
\| * \| \| \| \| \| \|	Merge branch 'security-59581-related-merge-requests-count' into 'master'	Marin Jankovski	2019-07-02	5	-10/+10
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose merge requests count based on user access See merge request gitlab/gitlabhq!3157
\| \| * \| \| \| \| \|	Expose merge requests count based on user access	Alexandru Croitor	2019-06-18	5	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Count issues related merge requests based on user access level. And issue can have related MRs from projects where user does not have access so the number of related merge requests should be adjusted based on user's ability to access the related MRs. https://gitlab.com/gitlab-org/gitlab-ce/issues/59581
* \| \| \| \| \| \| \|	Merge branch 'rs-ee-only-routes-2' into 'master'	Lin Jen-Shin	2019-06-27	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE-EE parity for routes See merge request gitlab-org/gitlab-ce!29994
\| * \| \| \| \| \| \| \|	Add Gitlab.ee method	Robert Speicher	2019-06-26	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method yields to the given block when the installation is EE.
* \| \| \| \| \| \| \| \|	Merge branch 'dz-remove-deprecated-user-routes' into 'master'	Mike Greiling	2019-06-27	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated user routes See merge request gitlab-org/gitlab-ce!30044
\| * \| \| \| \| \| \| \|	Remove deprecated /u/:username routesdz-remove-deprecated-user-routes	Dmitriy Zaporozhets	2019-06-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also release `u` from TOP_LEVEL_ROUTES Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'	Stan Hu	2019-06-26	3	-11/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
\| * \| \| \| \| \| \| \|	refactor: remove Sentry from application settings	Roger Meier	2019-06-25	3	-11/+3
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-cache-negative-entries-find-commit' into 'master'	Douglas Barbosa Alexandre	2019-06-26	1	-18/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow caching of negative FindCommit matches See merge request gitlab-org/gitlab-ce!29952
\| * \| \| \| \| \| \| \|	Allow caching of negative FindCommit matchessh-cache-negative-entries-find-commit	Stan Hu	2019-06-25	1	-18/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When FindCommit ref caching is enabled, negative matches would previously not be cached. However, if a source branch is deleted, there's no need to keep looking up the same commit. This change caches the result of a nil commit.
* \| \| \| \| \| \| \| \|	Merge branch 'mc/bump/update-codquality-version' into 'master'	Grzegorz Bizon	2019-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Code Quality version Closes gitlab-ee#12408 See merge request gitlab-org/gitlab-ce!30056
\| * \| \| \| \| \| \| \| \|	Bump Code Quality versionmc/bump/update-codquality-version	Matija Čupić	2019-06-25	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'graphql-error-when-authorizing-with-no-permissions-defined' ↵	Bob Van Landuyt	2019-06-26	1	-6/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sanity check for GraphQL authorized? See merge request gitlab-org/gitlab-ce!29921
\| * \| \| \| \| \| \| \|	Remove unused authorized_find methodgraphql-error-when-authorizing-with-no-permissions-defined	Luke Duncalfe	2019-06-26	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29921#note_184713939
\| * \| \| \| \| \| \| \|	Sanity check for GraphQL authorized?	Luke Duncalfe	2019-06-26	1	-0/+6
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise an exception if a developer calls any of the GraphQL authorization methods and a `authorize :permission` is missing from a mutation class. Previously `authorized?` would return `true` in this situation, which although technically is accurate is not what a developer is intending.
* \| \| \| \| \| \| \|	Parse the cached value when the it is false	Douglas Barbosa Alexandre	2019-06-25	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Fix broken worktree test	GitalyBot	2019-06-25	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The setup was wrong, and due to Gitaly being a bit more strict it had to match up. The test is now accurate and passing again.
* \| \| \| \| \| \|	Merge branch 'sh-quiet-backup-secrets-log' into 'master'	Rémy Coutable	2019-06-25	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Silence backup warnings when CRON=1 in use Closes #63703 See merge request gitlab-org/gitlab-ce!30033
\| * \| \| \| \| \| \|	Silence backup warnings when CRON=1 in use	Stan Hu	2019-06-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If CRON=1 is in use, we shouldn't generate any output or admins may be notified via e-mail about unnecessary warnings. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63703
* \| \| \| \| \| \| \|	Merge branch 'pages-ssl-project-aware-feature-flag' into 'master'	Nick Thomas	2019-06-25	2	-9/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use project depended feature flag for pages ssl and get certificates only for enabled domains See merge request gitlab-org/gitlab-ce!29609
\| * \| \| \| \| \| \|	Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flag	Vladimir Shushlin	2019-06-25	2	-9/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* \| \| \| \| \| \| \|	Refactor inside_transaction? to Gitlab::Database	Andrew Newdigate	2019-06-25	2	-15/+17
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a small change to move AfterCommitQueue.inside_transaction? to Gitlab::Database.inside_transaction? Since this change is required by different changes which may not arrive in sequence, it's easier to extract this change out on it's own.
* \| \| \| \| \| \|	Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-tracking	Heinrich Lee Yu	2019-06-25	2	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes migration and all other places the attribute is used
* \| \| \| \| \| \|	Limit time tracking values to hours	Jon Kolb	2019-06-25	2	-1/+4
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds an instance setting to limit display of time tracking values to hours only
* \| \| \| \| \|	Merge branch 'refactor_deployment_cluster' into 'master'	Stan Hu	2019-06-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
\| * \| \| \| \| \|	Rename method to not clash with #clusterrefactor_deployment_cluster	Thong Kuah	2019-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We will introduce #cluster at a later stage. Also deprecate this method
* \| \| \| \| \| \|	Change HTTP Status Code when repository disabled	Sam Battalio	2019-06-24	3	-2/+12
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-optimize-todos-controller' into 'master'	Douglas Barbosa Alexandre	2019-06-24	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
\| * \| \| \| \| \|	Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controller	Stan Hu	2019-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since this scope is used in both the controller and the API, we rename it to make it clear that it's used for both.
* \| \| \| \| \| \|	Revert "Merge branch..."	Kamil Trzciński	2019-06-24	1	-3/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !29832
* \| \| \| \| \|	Merge branch 'search-blob-basenames' into 'master'	Kamil Trzciński	2019-06-24	1	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
\| * \| \| \| \| \|	Build correct basenames for title search resultssearch-blob-basenames	Markus Koller	2019-06-20	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.