summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update srmX configurationdocs/update-srm-settingsSteve Azzopardi2019-08-161-64/+19
|
* Merge branch 'enable-dag-support-by-default' into 'master'Kamil Trzciński2019-08-162-3/+3
|\ | | | | | | | | | | | | Enable DAG support by default Closes #65457 See merge request gitlab-org/gitlab-ce!31814
| * Enable DAG support by defaultenable-dag-support-by-defaultKamil Trzciński2019-08-142-3/+3
| | | | | | | | | | | | This toggles the ci_dag_support flag to be on by default. This relies on ci_dag_limit_needs to be present to reduce amount of inter-dependencies between jobs
* | Merge branch 'do-not-vendor-go-mod' into 'master'Grzegorz Bizon2019-08-161-0/+26
|\ \ | | | | | | | | | | | | Don't use go mod vendor See merge request gitlab-org/gitlab-ce!31721
| * | Don't use go mod vendorNick Thomas2019-08-121-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change comes out of a discussion between Ben Kochie and me, around this MR: https://gitlab.com/gitlab-org/gitlab-pages/merge_requests/164 gitlab-elasticsearch-indexer already uses `go mod` without a `vendor/` directory. It has caused some intermittent build failures in the gitlab-ce/ee CI pipelines, but has otherwise been fine. I think that treating our Go dependencies in the same way we do our Ruby or Node.js ones is reasonable, and it has some minor benefits: * Contributors find it easier to submit MRs * MRs are easier to review * Makefiles are easier to write
* | | Merge branch 'ce-issue_12619' into 'master'Jan Provaznik2019-08-162-0/+159
|\ \ \ | | | | | | | | | | | | | | | | [Backport] Add feature specs for multiple issue boards for groups See merge request gitlab-org/gitlab-ce!31481
| * | | Add feature specs for multiple group issue boardsFelipe Artur2019-08-162-0/+159
|/ / / | | | | | | | | | Add feature specs for multiple issue boards for groups
* | | Merge branch 'fe-add-unbinds-to-discussion-keyboard-navigator' into 'master'Kushal Pandya2019-08-163-0/+35
|\ \ \ | | | | | | | | | | | | | | | | Add key unbinds to DiscussionKeyboardNavigator See merge request gitlab-org/gitlab-ce!31857
| * | | Add key unbinds to DiscussionKeyboardNavigatorfe-add-unbinds-to-discussion-keyboard-navigatorPaul Slaughter2019-08-153-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds comment to explain why this works on the diff-tab when it's only used in `notes-app`. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30144#note_204066538
* | | | Merge branch 'docs-arm64-k8s-support' into 'master'Evan Read2019-08-161-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a note about the lack of arm64 support See merge request gitlab-org/gitlab-ce!31887
| * | | | Add a note about the lack of arm64 supportAlexander Tanayno2019-08-161-0/+3
|/ / / /
* | | | Merge branch 'docs/profile-security-dashboard' into 'master'Evan Read2019-08-161-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Document option to set Security Dashboard as default view for groups See merge request gitlab-org/gitlab-ce!31795
| * | | | Document option to set Security Dashboard as default view for groupsAchilleas Pipinellis2019-08-161-0/+10
|/ / / /
* | | | Merge branch 'productivity-analytics-docs-revert' into 'master'Evan Read2019-08-161-69/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert adding productivity analytics docs See merge request gitlab-org/gitlab-ce!31848
| * | | | Revert adding productivity analytics docsMartin Wortschack2019-08-161-69/+0
|/ / / /
* | | | Merge branch 'docs-acyclic-graph-list' into 'master'Evan Read2019-08-161-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove indentation from list See merge request gitlab-org/gitlab-ce!31885
| * | | | Remove indentation from listMarcel Amirault2019-08-161-2/+2
|/ / / /
* | | | Merge branch 'implement-dag-docs' into 'master'Evan Read2019-08-162-0/+154
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs for DAG based on `needs:` See merge request gitlab-org/gitlab-ce!31337
| * | | | Revert "Improve test for .with_needs"Kamil Trzciński2019-08-162-0/+154
|/ / / / | | | | | | | | | | | | This reverts commit d1eddaa98a83400d043678a2239adc4d781b4549
* | | | Merge branch '24705-multi-selection-for-delete-on-registry-page' into 'master'Thong Kuah2019-08-1513-67/+425
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Multi selection for delete on registry page" Closes #24705 See merge request gitlab-org/gitlab-ce!30837
| * | | | Limit registry tag bulk delete to 15 items24705-multi-selection-for-delete-on-registry-pageGiorgenes Gelatti2019-08-151-2/+10
| | | | |
| * | | | Adjustments to event removal and modal descriptionNick Kipling2019-07-302-16/+14
| | | | |
| * | | | Reworked how deletion works with multi vs singleNick Kipling2019-07-304-53/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single deletion no longer requires a prop Modal description is now generated on demand Added dedicated functions for deleting Updated tests to match new function naming Updated css class name to be more specific
| * | | | Applying feedback changesNick Kipling2019-07-304-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated table registry to remove singleItemToBeDeleted Renamed usages of idx to index Tidied and simplified css styling Added clarification comment to test regex Updated pot file
| * | | | Validates tag names and tags#bulk_destroyGiorgenes Gelatti2019-07-302-0/+16
| | | | |
| * | | | Updated select all to be more explicitNick Kipling2019-07-302-18/+21
| | | | |
| * | | | Updating with suggestions as per reviewNick Kipling2019-07-302-32/+58
| | | | |
| * | | | Updating table_registry testsNick Kipling2019-07-301-6/+12
| | | | |
| * | | | Updating FE to use new bulk_destroy endpointNick Kipling2019-07-302-13/+15
| | | | |
| * | | | Support bulk registry tag deleteGiorgenes Gelatti2019-07-303-1/+53
| | | | |
| * | | | Added changelog entryNick Kipling2019-07-301-0/+5
| | | | |
| * | | | Implement multi select deletion for container registryNick Kipling2019-07-307-46/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added checkboxes to each image row Added delete selected images button Changed row delete button to appear on row hover Changed confirmation modal message Changed delete logic to support multi Added tests for multi select Updated pot file Updated rspec test for new functionality
* | | | | Merge branch 'add-nonce-to-shortcuts-eval' into 'master'Stan Hu2019-08-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add nonce to globalEval in shortcuts.js See merge request gitlab-org/gitlab-ce!31837
| * | | | | Add nonce to eval in shortcuts.jsadd-nonce-to-shortcuts-evalHeinrich Lee Yu2019-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents the eval script being blocked when we have CSP rules to disable inline scripts
* | | | | | Merge branch 'enable-specific-embeds' into 'master'Mayra Cabrera2019-08-156-23/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support metrics dashboard query parameters in GFM metrics filter See merge request gitlab-org/gitlab-ce!31304
| * | | | | | Support query parameters in metrics embedsSarah Yasonik2019-08-156-23/+102
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/62971 Adds support for embedding specific charts from the metrics dashboard. Expected parameters are dashboard, title, group, and y_label.
* | | | | | Merge branch '65927-role-span-css-looks-too-large' into 'master'Fatih Acet2019-08-151-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for role span being too 'ballooned' Closes #65927 See merge request gitlab-org/gitlab-ce!31706
| * | | | | | Fix for role span being too 'ballooned'65927-role-span-css-looks-too-largeAsh McKenzie2019-08-121-5/+0
| | | | | | |
* | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-08-152-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.68.0 See merge request gitlab-org/gitlab-ce!31729
| * | | | | | | Update dependency @gitlab/svgs to ^1.68.0Lukas Eipert2019-08-132-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'squash-project-templates-on-update' into 'master'Michael Kozono2019-08-154-14/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash project templates on update See merge request gitlab-org/gitlab-ce!31592
| * | | | | | | | Squash project templates on updateHordur Freyr Yngvason2019-08-154-14/+66
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://gitlab.com/gitlab-org/gitlab-ce/issues/46043, project templates should be squashed before updating, so that repositories created from these templates don't include the full history of the backing repository.
* | | | | | | | Merge branch 'sh-fix-discussions-spec' into 'master'Mayra Cabrera2019-08-151-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing N+1 spec in spec/requests/api/discussions_spec.rb See merge request gitlab-org/gitlab-ce!31865
| * | | | | | | | Fix failing N+1 spec in spec/requests/api/discussions_spec.rbStan Hu2019-08-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was failing in EE because the API helper `get()` creates a personal access token each time it's run. We can avoid that by pre-creating a personal access token and passing it each time.
* | | | | | | | | Merge branch 'new-cycle-analytics-backend-migrations' into 'master'Mayra Cabrera2019-08-1510-0/+149
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrations for Cycle Analytics backend See merge request gitlab-org/gitlab-ce!31621
| * | | | | | | | | Migrations for Cycle Analytics backendAdam Hegyi2019-08-1510-0/+149
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change lays the foundation for customizable cycle analytics stages. The main reason for the change is to extract the event definitions to separate objects (start_event, end_event) so that it could be easily customized later on.
* | | | | | | | | Merge branch '65797-remove-gitaly-rebase-status-from-model' into 'master'Mayra Cabrera2019-08-154-53/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Only read rebase status from the model See merge request gitlab-org/gitlab-ce!31847
| * | | | | | | | Only read rebase status from the modelNick Thomas2019-08-154-53/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to 12.1, rebase status was looked up directly from Gitaly. In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14417 , a DB column was added to track the status instead. However, we couldn't stop looking at the gitaly status immediately, since some rebases may been running across the upgrade. Now that we're in 12.3, it is safe to remove the direct-to-gitaly lookup. This also happens to fix a 500 error that is seen when viewing an MR for a fork where the source project has been removed. We still look at the Gitaly status in the service, just in case Gitaly and Sidekiq get out of sync - I assume this is possible, and it's a relatively cheap check. Since we atomically check and set `merge_requests.rebase_jid`, we should never enqueue two `RebaseWorker` jobs in parallel.
* | | | | | | | Merge branch 'mc-removes-fixtures-from-db-files' into 'master'Stan Hu2019-08-152-5/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes db/fixtures from database files See merge request gitlab-org/gitlab-ce!31635
| * | | | | | | | Removes db/fixtures from database filesMayra Cabrera2019-08-152-5/+13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid Danger to suggest a database review for files inside db/fixtures
View Lorry Controller Status