summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Suggest disabling of NFS delegation not needed for RHEL7 updateStan Hu2019-08-061-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Red Hat finally fixed the NFS server delegation problem that caused the TEST_STATEID flood. Mention the docs that disabling delegation may no longer be needed.
* | | | | | | Merge branch 'analytics-top-nav' into 'master'Clement Ho2019-08-062-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add top navigation analytics link See merge request gitlab-org/gitlab-ce!30324
| * | | | | | | Add top navigation analytics linkanalytics-top-navLuke Bennett2019-08-062-1/+6
| |/ / / / / /
* | | | | | | Merge branch '65152-selective-highlight' into 'master'Bob Van Landuyt2019-08-067-29/+93
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support selective highlighting of lines See merge request gitlab-org/gitlab-ce!31361
| * | | | | | | Support selective highlighting of lines65152-selective-highlightPatrick Bajao2019-08-067-29/+93
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of highlighting all lines when not all of them are needed, only highlight specific lines. The `BlobPresenter#highlight` method has been updated to support `since` and `to` params. These params will be used to limit the content to be highlighted. Modify `Gitlab::Highlight` to support `since` param which will then be used to determine the starting line number.
* | | | | | | Merge branch 'rs-no-review-for-auto-deploy' into 'master'Rémy Coutable2019-08-061-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Disable review apps for auto-deploy branches See merge request gitlab-org/gitlab-ce!31494
| * | | | | | Disable Danger review for auto-deploy branchesrs-no-review-for-auto-deployRobert Speicher2019-08-051-0/+1
| | | | | | |
| * | | | | | Disable review apps for auto-deploy branchesRobert Speicher2019-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These branches are frequently updated and automatically deployed to real environments, there's not really a benefit to building review apps for them that never get used.
* | | | | | | Merge branch '65660-update-karma-to-4.2.0' into 'master'65701-docs-feedback-add-a-link-to-a-gitmessage-template-that-can-be-used-for-commitsMike Greiling2019-08-063-189/+228
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update karma to 4.2.0 Closes #65660 See merge request gitlab-org/gitlab-ce!31495
| * | | | | | | Update karma to 4.2.0Takuya Noguchi2019-08-063-189/+228
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update karma-chrome-launcher, karma-coverage-istanbul-reporter, and karma-webpack. Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch '43080-speed-up-deploy-keys' into 'master'Thong Kuah2019-08-0611-48/+78
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the performance of viewing deploy keys Closes #43080 See merge request gitlab-org/gitlab-ce!31384
| * | | | | | Move migration from migrate to post_migrate43080-speed-up-deploy-keysStan Hu2019-08-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just in case the creation of this index takes a while to create.
| * | | | | | Add partial index for deploy keysStan Hu2019-08-052-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31384, this appears to drop the runtime of the query from 1.2 ms (cold), 500ms (warm cache) to < 20 ms.
| * | | | | | Add spec for User#accessible_deploy_keysStan Hu2019-08-051-0/+18
| | | | | | |
| * | | | | | Speed up loading and filtering deploy keys and their projectsNick Thomas2019-08-057-41/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes how we eager-load projects, routes, and namespaces required by the deploy keys endpoint, getting a 10x improvement in my local testing. The endpoint still doesn't scale in-general, but going from ~13 seconds to dump a 63K result to generating the same thing in ~1.6 seconds seems like a good improvement to me.
| * | | | | | Stop using pluck to get deploy keys for a userNick Thomas2019-08-052-6/+6
| | | | | | |
| * | | | | | Fix a bug in User#accessible_deploy_keysNick Thomas2019-08-051-1/+1
| | | | | | |
* | | | | | | Merge branch 'make-issue-boards-importable' into 'master'Sean McGivern2019-08-0610-2/+124
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make issue boards importable See merge request gitlab-org/gitlab-ce!31434
| * | | | | | | Make issue boards importablemake-issue-boards-importableJason Colyer2019-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added issue board to imported contents in docs
| * | | | | | | Make issue boards importableJason Colyer2019-08-051-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed extra changelog
| * | | | | | | Make issue boards importableJason Colyer2019-08-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Created changelog
| * | | | | | | Make Issue boards importableJason Colyer2019-08-052-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added space to li definiton - Remove milestone from import_export.yml
| * | | | | | | Make issue boards importableJason Colyer2019-08-029-2/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added Importable to models/list.rb - Did unless: :importable? on board validation - Created changelog - Modified haml to show issue boards are importable - Added needed spec tests - Modified project.json to include board information - Added relevant models to all_models - Added relevant models to import_export - Added relevant models to safe_model_attributes
* | | | | | | | Merge branch 'backport-productivty-analytics-migrations' into 'master'Grzegorz Bizon2019-08-066-3/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport productivity analytics migrations See merge request gitlab-org/gitlab-ce!31298
| * | | | | | | | Add MergeRequestDiff#lines_count convenience methodbackport-productivty-analytics-migrationsPavel Shutsin2019-08-063-0/+20
| | | | | | | | |
| * | | | | | | | Add inheritance flexibility to issuable collectionsPavel Shutsin2019-08-061-3/+2
| | | | | | | | |
| * | | | | | | | Add migrations for productivity analyticsPavel Shutsin2019-08-062-0/+20
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '9489-designs-annotations' into 'master'Kushal Pandya2019-08-066-4/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add point of interest discussions to designs" See merge request gitlab-org/gitlab-ce!31276
| * | | | | | | | Revert "Fixed comparing value to undefined"Natalia Tepluhina2019-08-066-4/+31
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d754beb74fbc06a2c744e15be4aa2831d8cef1c0.
* | | | | | | | Merge branch '65263-manual-action' into 'master'Kushal Pandya2019-08-064-12/+62
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides loading spinner after request Closes #65263 See merge request gitlab-org/gitlab-ce!31478
| * | | | | | | | Hides loading spinner after request65263-manual-actionFilipa Lacerda2019-08-064-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the pipeline's actions, moves the request to the component to allow to manage the inner state properly
* | | | | | | | | Merge branch 'alerts-dropdown-to-modal-part-2-ce' into 'master'Kushal Pandya2019-08-063-19/+79
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alerts dropdown to modal CE2 See merge request gitlab-org/gitlab-ce!31181
| * | | | | | | | | Add actions dropdown to metrics chartsSimon Knox2019-08-063-19/+79
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Added as EE backport
* | | | | | | | | Merge branch '65606-docs-clarify-usage-of-elasticsearch-with-gitaly-nfs' ↵Achilleas Pipinellis2019-08-061-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "DOCS Clarify usage of ElasticSearch with Gitaly non-NFS" Closes #65606 See merge request gitlab-org/gitlab-ce!31454
| * | | | | | | | | Resolve "DOCS Clarify usage of ElasticSearch with Gitaly non-NFS"Anton Smith2019-08-061-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/edit-elasticsearch-troubleshooting' into 'master'Achilleas Pipinellis2019-08-061-14/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit new troubleshooting doc See merge request gitlab-org/gitlab-ce!31512
| * | | | | | | | | Edit new troubleshooting docEvan Read2019-08-061-14/+14
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/more-crosslinking-of-cluster-topics' into 'master'Achilleas Pipinellis2019-08-061-13/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross link between cluster topics Closes #65617 See merge request gitlab-org/gitlab-ce!31506
| * | | | | | | | | Cross link between cluster topicsEvan Read2019-08-061-13/+21
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-ssot-customization' into 'master'Achilleas Pipinellis2019-08-067-66/+192
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT for customization docs Closes #64588 See merge request gitlab-org/gitlab-ce!31308
| * | | | | | | | | SSoT work on customization docsMatt Penna2019-08-067-66/+192
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed all docs in the customization section and updated them to adhere to our SSoT standards.
* | | | | | | | | Merge branch 'update-reliable-fetcher' into 'master'Sean McGivern2019-08-063-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update reliable fetcher See merge request gitlab-org/gitlab-ce!31416
| * | | | | | | | | Update reliable fetcherupdate-reliable-fetcherValery Sizov2019-08-063-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added retry_count increment when job is recovered
* | | | | | | | | | Merge branch 'winh-issue-boards-service-refactoring-note' into 'master'Kushal Pandya2019-08-061-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about refactoring to board_service.js See merge request gitlab-org/gitlab-ce!31468
| * | | | | | | | | Add note about refactoring to board_service.jsWinnie Hellmann2019-08-061-0/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-update-addon-minutes' into 'master'Evan Read2019-08-061-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: add addon minute roll over info See merge request gitlab-org/gitlab-ce!31350
| * | | | | | | | | Docs: add addon minute roll over infoTristan Williams2019-08-061-1/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Evan Read2019-08-062-0/+346
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '65386-docs-add-elasticsearch-troubleshooting-to-administrator-troubleshooting-section' into 'master' Docs-Add ElasticSearch Troubleshooting Closes #65386 See merge request gitlab-org/gitlab-ce!31343
| * | | | | | | | Add ElasticSearch troubleshootingJason Colyer2019-08-062-0/+346
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added elasticsearch.md * Added reference to guide in Troubleshooting section
* | | | | | | | Merge branch 'sh-use-redis-caching-store' into 'master'Ash McKenzie2019-08-064-9/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rails 5.2 Redis caching store Closes #64794 See merge request gitlab-org/gitlab-ce!30966