summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'ee-12980-address-blocking-mr-docs-review' into 'master'Evan Read2019-08-194-15/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve docs for cross-project MR dependencies Closes gitlab-ee#12980 See merge request gitlab-org/gitlab-ce!31904
| * | | | | | | Improve docs for cross-project MR dependenciesNick Thomas2019-08-194-15/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Addressing a documentation review by Marcia!
* | | | | | | Merge branch 'docs-update-ci-quick-start' into 'master'Evan Read2019-08-194-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Refresh CI quick start screenshots See merge request gitlab-org/gitlab-ce!31877
| * | | | | | | Docs: Refresh CI quick start screenshotsTristan Williams2019-08-194-0/+0
|/ / / / / / /
* | | | | | | Merge branch 'remove-mysql-from-dev-docs' into 'master'Evan Read2019-08-1910-72/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove MySQL references from development docs See merge request gitlab-org/gitlab-ce!31712
| * | | | | | | Remove MySQL references from development docsNick Thomas2019-08-1610-72/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed the doc/development/testing_guide/best_practices.md still referenced the `[run mysql]` tags, etc. They no longer work, so I removed them, then realised I had better clean up the rest of doc/development !
* | | | | | | | Merge branch 'updates-rate-limit-docs' into 'master'Evan Read2019-08-182-3/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mentions `auth.log` on Rate limit docs See merge request gitlab-org/gitlab-ce!31906
| * | | | | | | | Mentions related log on Rate limit docsMayra Cabrera2019-08-182-3/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Requests over the rate limit are logged into `auth.log`
* | | | | | | | Merge branch 'docs/update-srm-settings' into 'master'Evan Read2019-08-181-64/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update srmX configuration description See merge request gitlab-org/gitlab-ce!31142
| * | | | | | | | Update srmX configurationdocs/update-srm-settingsSteve Azzopardi2019-08-161-64/+19
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-api-ci-auth' into 'master'Evan Read2019-08-181-1/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | add GitLab CI job token API authentication section See merge request gitlab-org/gitlab-ce!30698
| * | | | | | | | add GitLab CI job token API authentication sectionBen Bodenmiller2019-08-181-1/+10
|/ / / / / / / /
* | | | | | | | Merge branch ↵Paul Slaughter2019-08-1727-23/+278
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50020-fe-allow-email-notifications-to-be-disabled-for-all-users-of-a-group' into 'master' UI for disabling group/project email notifications Closes #50020 See merge request gitlab-org/gitlab-ce!30961
| * | | | | | | | UI for disabling group/project email notificationBrett Walker2019-08-1727-23/+278
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level
* | | | | | | | Merge branch 'legacy-attachments-migrate-fix' into 'master'Michael Kozono2019-08-1611-4/+584
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate legacy uploads rake tasks See merge request gitlab-org/gitlab-ce!29409
| * | | | | | | | Add rake tasks for migrating leacy uploadslegacy-attachments-migrate-fixJarka Košanová2019-08-1611-4/+584
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move uploads created by AttachmentUploader - handle also files created for legacy_diff_notes
* | | | | | | | | Merge branch ↵Paul Slaughter2019-08-165-0/+69
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10972-be-allow-restricting-group-members-by-a-domain-whitelist-ce' into 'master' Add new table to store email domain per group See merge request gitlab-org/gitlab-ce!31071
| * | | | | | | | Add new table to store email domainGosia Ksionek2019-08-165-0/+69
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to save user preferences regarding user emails allowed to be invited to group Add foreign_key and down method Change adding foreign key Add partial call to view Add changelog entry Fix schema
* | | | | | | | Merge branch '62971-embed-specific-metrics-chart-in-issue' into 'master'Clement Ho2019-08-163-14/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Embed specific metrics chart in issue Closes #62971 See merge request gitlab-org/gitlab-ce!31644
| * | | | | | | | Adds specific metric styles and propLaura Montemayor2019-08-163-14/+29
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds the styles for displaying a single chart next to another one when embedding them in an issue.
* | | | | | | | Merge branch '66023-starrers-count-do-not-match-after-searching' into 'master'Stan Hu2019-08-163-56/+119
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix starrers counts after searching See merge request gitlab-org/gitlab-ce!31823
| * | | | | | | | Add CHANGELOG entry66023-starrers-count-do-not-match-after-searchingDouglas Barbosa Alexandre2019-08-151-0/+5
| | | | | | | | |
| * | | | | | | | Fix starrers counters after searchingDouglas Barbosa Alexandre2019-08-152-56/+114
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-process-commit-worker-n+1' into 'master'Stan Hu2019-08-165-67/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look up upstream commits once before queuing ProcessCommitWorkers Closes #65464 See merge request gitlab-org/gitlab-ce!31871
| * | | | | | | | | Look up upstream commits once before queuing ProcessCommitWorkersDouwe Maan2019-08-165-67/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking if a commit already exists in the upstream project in its ProcessCommitWorker and bailing out if it does, we check the existence of all commits in bulk in Git::BranchHooksService, so that we can skip scheduling ProcessCommitWorker jobs for those commits that already exist upstream entirely.
* | | | | | | | | | Merge branch 'optimize-note-indexes' into 'master'Mayra Cabrera2019-08-164-2/+66
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize DB indexes for ES indexing of notes See merge request gitlab-org/gitlab-ce!31846
| * | | | | | | | | | Optimize DB indexes for ES indexing of notesMarkus Koller2019-08-164-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To index notes, we exclude system notes and use `find_in_batches` to load them in batches for submission to the ES bulk import API. These queries often result in DB timeouts because the usage of `ORDER BY id` results in the `notes_pkey` index being used. This adds an optimized partial index, and removes the unused index `index_notes_on_noteable_type` which is already covered for our usage by the existing `index_notes_on_noteable_id_and_noteable_type`. Newer versions of PostgreSQL (at least 11) are smarter about this and use `index_notes_on_project_id_and_noteable_type` instead, so we might be able to remove the partial index again in the future.
* | | | | | | | | | | Merge branch 'sh-post-receive-cache-clear-once' into 'master'Douwe Maan2019-08-1611-27/+201
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire project caches once per push instead of once per ref Closes #52046 See merge request gitlab-org/gitlab-ce!31876
| * | | | | | | | | | | Expire project caches once per push instead of once per refStan Hu2019-08-1611-27/+201
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `ProjectCacheWorker` would be scheduled once per ref, which would generate unnecessary I/O and load on Sidekiq, especially if many tags or branches were pushed at once. `ProjectCacheWorker` would expire three items: 1. Repository size: This only needs to be updated once per push. 2. Commit count: This only needs to be updated if the default branch is updated. 3. Project method caches: This only needs to be updated if the default branch changes, but only if certain files change (e.g. README, CHANGELOG, etc.). Because the third item requires looking at the actual changes in the commit deltas, we schedule one `ProjectCacheWorker` to handle the first two cases, and schedule a separate `ProjectCacheWorker` for the third case if it is needed. As a result, this brings down the number of `ProjectCacheWorker` jobs from N to 2. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52046
* | | | | | | | | | | Merge branch 'sh-fix-arel-deprecation-join' into 'master'Mayra Cabrera2019-08-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Arel deprecation warning in clusters_hierarchy See merge request gitlab-org/gitlab-ce!31916
| * | | | | | | | | | Fix Arel deprecation warning in clusters_hierarchysh-fix-arel-deprecation-joinStan Hu2019-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in https://github.com/rails/rails/pull/29619, this removes this warning message: ``` Delegating join_sources to arel is deprecated and will be removed in Rails 6.0. (called from project_clusters_base_query at app/models/clusters/clusters_hierarchy.rb:62) ``` Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/61451
* | | | | | | | | | | Merge branch 'rf-remove-group-overview-security-dashboard-feature-flag' into ↵62373-badge-counter-very-low-contrast-between-foreground-and-background-colorsStan Hu2019-08-163-8/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove Security Dashboard feature flag See merge request gitlab-org/gitlab-ce!31820
| * | | | | | | | | | | Remove Security Dashboard feature flagrossfuhrman2019-08-163-8/+6
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the group_overview_security_dashboard feature flag
* | | | | | | | | | | Merge branch 'gy-quarantine-web-ide-test' into 'master'Walmyr Lima e Silva Filho2019-08-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantining add_file_template_spec See merge request gitlab-org/gitlab-ce!31908
| * | | | | | | | | | | Quarantining add_file_template_spec testGrant Young2019-08-161-1/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue - https://gitlab.com/gitlab-org/quality/nightly/issues/127
* | | | | | | | | | | Merge branch 'tr-embed-metric-links' into 'master'Filipa Lacerda2019-08-167-5/+139
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate shareable link for specific metric charts See merge request gitlab-org/gitlab-ce!31339
| * | | | | | | | | | | Add clipboard button to metric chart dropdownTristan Read2019-08-167-5/+139
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a clipboard button to the metrics dashboard, that allows copying a link to an individual chart.
* | | | | | | | | | | Merge branch 'mc/feature/pipeline-tracking-config-ce' into 'master'Kamil Trzciński2019-08-169-9/+65
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `needs:` CI config option CE Closes gitlab-ee#12334 See merge request gitlab-org/gitlab-ce!31346
| * | | | | | | | | | | Port changes from EEmc/feature/pipeline-tracking-config-ceMatija Čupić2019-08-049-9/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12343
* | | | | | | | | | | | Merge branch 'fix/commits-api-empty-refname' into 'master'Nick Thomas2019-08-163-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix handling of empty ref_name parameter string in commits api Closes #64745 See merge request gitlab-org/gitlab-ce!31687
| * | | | | | | | | | | | remove encoding comment created by emacs ruby-modeArmin Hohenegger2019-08-131-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | add a test for empty ref_name to api commits specArmin Hohenegger2019-08-131-0/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix handling of empty ref_name parameter string in commits apiArmin Hohenegger2019-08-102-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when params[:ref_name] is set to "" by passing an empty query parameter to the api it is evaluated as false by the || operator. The use of active support core extensions presence method fixes the original implemantation. https://guides.rubyonrails.org/active_support_core_extensions.html#presence
* | | | | | | | | | | | | Merge branch 'patch-31' into 'master'Nick Thomas2019-08-161-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate Live preview entry for MR docs See merge request gitlab-org/gitlab-ce!31763
| * | | | | | | | | | | | | Removed duplicate Live preview entry for MR docsPhilipp Hasper2019-08-131-9/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '12111-snippet-index-ee-docs' into 'master'Grzegorz Bizon2019-08-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: sync ES updates See merge request gitlab-org/gitlab-ce!31883
| * | | | | | | | | | | | | | Doc: sync ES updates12111-snippet-index-ee-docsMark Chao2019-08-161-0/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '56130-deployment-date' into 'master'Grzegorz Bizon2019-08-165-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose finished_at for the Deployment entity See merge request gitlab-org/gitlab-ce!31808
| * | | | | | | | | | | | | | | Add finished_at to the internal API Deployment entity56130-deployment-dateKrasimir Angelov2019-08-155-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/56130.
* | | | | | | | | | | | | | | | Merge branch ↵Grzegorz Bizon2019-08-1613-33/+311
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flow' into 'master' Soft email confirmation flow Closes #47003 See merge request gitlab-org/gitlab-ce!31245