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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Adds chaos endpoints to Sidekiqan-sidekiq-chaos	Andrew Newdigate	2019-07-18	1	-0/+49
\| \| \| \| \|	This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
*	Refactored WebIdeCommitsCount class	Francisco Javier López	2019-07-16	5	-19/+34
\| \| \| \| \| \|	We're adding more redis base counters to the web ide and other classes. We're refactoring this class in other to use the logic in other places.
*	Merge branch 'remove-support-for-legacy-pipeline-triggers' into 'master'	Kamil Trzciński	2019-07-16	3	-1/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove support for legacy pipeline triggers Closes #30231 See merge request gitlab-org/gitlab-ce!30133
\| *	Do not import legacy triggers from project JSONremove-support-for-legacy-pipeline-triggers	Fabio Pitino	2019-07-15	1	-0/+7
\| \|
\| *	Ensure ImportExport maintains trigger ownership	Fabio Pitino	2019-07-15	1	-1/+1
\| \|
\| *	Allow use of legacy triggers with feature flag	Fabio Pitino	2019-07-15	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep feature flag disabled by default and turn off all functionality related to legacy triggers. * Block legacy triggers from creating pipeline * Highlight legacy triggers to be invalid via the UI * Make legacy triggers invalid in the model
* \|	Merge branch 'issue-64070-asciidoctor-section-anchors' into 'master'	Bob Van Landuyt	2019-07-16	2	-2/+29
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable section anchors Closes #64070 See merge request gitlab-org/gitlab-ce!30666
\| * \|	Enable section anchors	Guillaume Grossetie	2019-07-16	2	-2/+29
\| \| \|
* \| \|	Update Release API docs	Jason Goodman	2019-07-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Include released_at parameter
* \| \|	Merge branch 'jc-remove-catfile-flag' into 'master'	Bob Van Landuyt	2019-07-16	2	-7/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove catfile cache feature flag See merge request gitlab-org/gitlab-ce!30750
\| * \| \|	Remove catfile cache feature flagjc-remove-catfile-flag	John Cai	2019-07-15	2	-7/+2
\| \| \| \|
* \| \| \|	Merge branch 'zj-update-proto' into 'master'	Douwe Maan	2019-07-16	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly-Proto to 1.37.0 See merge request gitlab-org/gitlab-ce!30774
\| * \| \| \|	Upgrade Gitaly-Proto to 1.37.0	Zeger-Jan van de Weg	2019-07-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was done to perform some local testing, but while the change was already made it made sense to commit the change.
* \| \| \| \|	Merge branch 'remove-complex-expressions-feature-flag' into 'master'	Kamil Trzciński	2019-07-16	3	-57/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing ci_variables_complex_expressions feature flag and deprecated code branches See merge request gitlab-org/gitlab-ce!30717
\| * \| \| \| \|	Removing ci_variables_complex_expressions feature flag and deprecated code ↵remove-complex-expressions-feature-flag	drew cimino	2019-07-12	3	-57/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branches
* \| \| \| \| \|	Merge branch 'bw-enhance-rake-seed' into 'master'	James Lopez	2019-07-16	1	-2/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow parameters for rake gitlab:seed:issues See merge request gitlab-org/gitlab-ce!30689
\| * \| \| \| \|	Allow parameters for rake gitlab:seed:issuesbw-enhance-rake-seed	Brett Walker	2019-07-15	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to specify backfill_weeks and average_issues_per_week
* \| \| \| \| \|	Merge branch '64407-vfazio-quirk-omniauth-strategies-openidconnect' into ↵	Stan Hu	2019-07-15	1	-0/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Convert client_auth_method to a Symbol for quirked OmniAuth providers Closes #64407 See merge request gitlab-org/gitlab-ce!30683
\| * \| \| \| \| \|	Symbolize client_auth_method for quirked providers	Vincent Fazio	2019-07-15	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Providers such as OpenIDConnect ultimately leverage the rack-oauth2 gem which requires the client_auth_method value to be defined as a symbol in order to correctly select the authorization method used. Derivative providers that specify OmniAuth::Strategies::OpenIDConnect as their strategy_class will also convert this value to a symbol. Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
* \| \| \| \| \| \|	Migrate null values for users.private_profile	Adam Hegyi	2019-07-15	2	-1/+18
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Background migration for changing null values to false - Set false as default value for private_profile DB column
* \| \| \| \| \|	Merge branch 'georgekoltsov/63955-fix-import-with-source-branch-deleted' ↵	Robert Speicher	2019-07-15	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Always return MR diff_refs if importing See merge request gitlab-org/gitlab-ce!30630
\| * \| \| \| \|	Add commit_id to AttributeCleaner::ALLOWED_REFERENCESgeorgekoltsov/63955-fix-import-with-source-branch-deleted	George Koltsov	2019-07-15	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '63694-tls-opts-for-helm-wait' into 'master'	Sean McGivern	2019-07-15	2	-12/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab Managed App ensure helm version uses tls opts Closes #63694 See merge request gitlab-org/gitlab-ce!30654
\| * \| \| \| \| \|	GitLab Managed App ensure helm version uses tls opts63694-tls-opts-for-helm-wait	Dylan Griffith	2019-07-15	2	-12/+13
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TLS opts were missing from helm version command which meant that it was just perpetually failing and hence wasting 30s of time waiting for a command to be successful that was never going to be successful. This never actually caused any errors because this loop will happily just fail 30 times without breaking the overall script but it was just a waste of installation time so now installing apps should be ~30s faster.
* \| \| \| \| \|	Filter Geo proxied data from api_json.logsh-filter-geo-output	Stan Hu	2019-07-14	1	-1/+2
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the base64-encoded value of the push-to-secondary data is saved in `api_json.log`, and this can easily be hundreds of megabytes. We should filter this from the logs.
* \| \| \| \|	Remove auto ssl feature flags	Vladimir Shushlin	2019-07-12	1	-9/+2
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remove feature flag for admin settings * remove feature flag for domain settings
* \| \| \|	Merge branch 'js-specs-transactions' into 'master'	Andreas Brandl	2019-07-12	2	-7/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use transactions in JS feature specs Closes #60207 See merge request gitlab-org/gitlab-ce!27496
\| * \| \| \|	Use transactions in JS feature specsjs-specs-transactions	Heinrich Lee Yu	2019-07-12	2	-7/+57
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses Rails transactional tests instead of DatabaseCleaner transaction strategy because that doesn't work with JS tests
* \| \| \|	Merge branch 'id-clean-up-mr-assignees-migration' into 'master'	Andreas Brandl	2019-07-12	1	-0/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cleanup migration for MR's multiple assignees See merge request gitlab-org/gitlab-ce!30269
\| * \| \| \|	Add cleanup migration for MR's mutliple assigneesid-clean-up-mr-assignees-migration	Igor Drozdov	2019-07-09	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The migration steals the remaining background jobs of populating MRs with assignees, executes them synchronously and then makes sure that all the assignees are migrated
* \| \| \| \|	Merge branch 'bvl-rename-routes-after-user-rename' into 'master'	Jan Provaznik	2019-07-12	3	-8/+106
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the name of a user-namespace to the user name See merge request gitlab-org/gitlab-ce!23272
\| * \| \| \| \|	Fix incorrect namespaces & route for user-routes	Bob Van Landuyt	2019-07-09	2	-0/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the `Namespace#name` and `Route#name` for all user namespaces and their personal projects in case they don't match the user name anymore. More info info in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
\| * \| \| \| \|	Lesser Namespace#name validations	Bob Van Landuyt	2019-07-09	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we use `Namespace#path` to build routes and URLs we can lessen the restrictions on `Namespace#name` so it can accomodate a user's name.
* \| \| \| \| \|	Merge branch 'upgrade-rails-5-2-ce' into 'master'	Bob Van Landuyt	2019-07-12	5	-7/+8
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Upgrade to Rails 5.2 See merge request gitlab-org/gitlab-ce!30052
\| * \| \| \| \|	Upgrade to Rails 5.2upgrade-rails-5-2-ce	Heinrich Lee Yu	2019-07-12	5	-7/+8
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Updates changed method names and fixes spec failures
* \| \| \| \|	Merge branch '55623-group-cluster-apis' into 'master'	Grzegorz Bizon	2019-07-12	4	-1/+146
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API support for group-level clusters" Closes #55623 See merge request gitlab-org/gitlab-ce!30213
\| * \| \| \| \|	Add API for CRUD group clusters55623-group-cluster-apis	Dylan Griffith	2019-07-11	3	-0/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is basically a copy of the API for project clusters.
\| * \| \| \| \|	Refactor: model errors for multi cluster validation	Dylan Griffith	2019-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current approach requires catching exceptions to handle these errors and callers are already handling model validations so it seems more appropriate. Also it seemed to convoluted to add this logic directly to the model since the model needs to check too many possible associations to determine whether or not there are more than one cluster since the model doesn't know what it's being created on. Additionally we only wanted to validate during create to avoid the risk of existing models becoming invalid by many different edge cases.
* \| \| \| \| \|	Merge branch 'issue-63298-asciidoc-sanitization' into 'master'	Douwe Maan	2019-07-12	4	-79/+163
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent excessive sanitization of AsciiDoc ouptut Closes #63298 See merge request gitlab-org/gitlab-ce!30290
\| * \| \| \| \| \|	Prevent excessive sanitization of AsciiDoc ouptut	Guillaume Grossetie	2019-07-12	4	-79/+163
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Don't use bang method when there is no safe method	Reuben Pereira	2019-07-12	1	-33/+59
\| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rubocop-hq/ruby-style-guide#dangerous-method-bang
* \| \| \| \| \|	Clean up CI reports	Philippe Lafoucrière	2019-07-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, `SAST_CONFIDENCE_LEVEL` has been renamed in https://gitlab.com/gitlab-org/security-products/sast/merge_requests/72
* \| \| \| \| \|	Remove unused method	Ryan Cobb	2019-07-11	1	-4/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '63667-hashed-storage-migration-count-correctly' into 'master'	Douglas Barbosa Alexandre	2019-07-11	2	-49/+41
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display the amount for Hashed Storage migration/rollback correctly Closes #63667 See merge request gitlab-org/gitlab-ce!29996
\| * \| \| \| \|	Display the amount for Hashed Storage migration/rollback correctly63667-hashed-storage-migration-count-correctly	Gabriel Mazetto	2019-07-10	2	-49/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rake script considers the specified range, if present, to calculate the affected amount of projects correctly.
* \| \| \| \| \|	Give Knative serving permissions to service account	Hordur Freyr Yngvason	2019-07-11	3	-3/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab uses a kubernetes service account to perform deployments. For serverless deployments to work as expected with externally created clusters with their own knative installations (e.g. via Cloud Run), this account requires additional permissions in the serving.knative.dev API group.
* \| \| \| \| \|	Merge branch 'better-merge-train-exlusive-lock-ce' into 'master'	Kamil Trzciński	2019-07-11	1	-0/+112
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Fix race condition on merge train with better exclusive lock See merge request gitlab-org/gitlab-ce!30352
\| * \| \| \| \| \|	Efficient merge train locksbetter-merge-train-exlusive-lock-ce	Shinya Maeda	2019-07-11	1	-0/+112
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Efficient merge train locks with Sequential Process helper.
* \| \| \| \| \|	Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'	Douwe Maan	2019-07-11	3	-17/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Banzai - avoid redis if attr is in DB cache See merge request gitlab-org/gitlab-ce!30334
\| * \| \| \| \| \|	Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cache	Mario de la Ossa	2019-07-10	3	-17/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When cache_collection_render runs we end up reading and writing things to redis even if we already have the rendered field cached in the DB. This commit avoids using redis at all whenever we have the field already rendered in the DB cache.