summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use a parametrized spec57410-api-create-release-link-with-ftp-address-return-400-bad-requestRobert Schilling2019-02-121-16/+6
| | | | Instead of repeating the tests, use a parametrized test. DRY
* Add support for FTP assets for releasesRobert Schilling2019-02-104-1/+41
| | | | Extend the list of supported protocols to include FTP.
* Merge branch 'pl-copy-still-active' into 'master'Stan Hu2019-02-101-1/+1
|\ | | | | | | | | | | | | Fix error when reloading code in Sidekiq Closes #54320 See merge request gitlab-org/gitlab-ce!25069
| * Fix error when reloading code in Sidekiqpl-copy-still-activePeter Leitzen2019-02-101-1/+1
|/ | | | | | | This commit fixes the following error in development: ArgumentError: A copy of Gitlab::Metrics::Transaction has been removed from the module tree but is still active!
* Merge branch ↵56965-rocket-mouseover-very-sensitive-alters-flag-positioningPhil Hughes2019-02-082-2/+27
|\ | | | | | | | | | | | | | | | | '57428-actionview-template-error-undefined-method-for-nil-nilclass' into 'master' Resolve "ActionView::Template::Error: undefined method `>' for nil:NilClass" Closes #57428 See merge request gitlab-org/gitlab-ce!25028
| * Improved readability of issues related MR status spec57428-actionview-template-error-undefined-method-for-nil-nilclassConstance Okoghenun2019-02-081-1/+2
| |
| * Added tests for merge_request_status partialJan Provaznik2019-02-081-0/+21
| |
| * Checking MR status date for related MR status tooltipConstance Okoghenun2019-02-081-2/+5
| | | | | | | | | | Changed related MR status tooltip content when MR status date is not available.
* | Merge branch 'diff-fuzzy-file-finder-feature-flag' into 'master'Filipa Lacerda2019-02-083-13/+64
|\ \ | | | | | | | | | | | | | | | | | | Adds a feature flag to the diff fuzzy file finder Closes #57403 See merge request gitlab-org/gitlab-ce!25006
| * | Adds a feature flag to the diff fuzzy file finderPhil Hughes2019-02-083-13/+64
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57403
* | | Merge branch 'chart-js-updates' into 'master'Phil Hughes2019-02-088-88/+219
|\ \ \ | | | | | | | | | | | | | | | | Update `chart.js` to 2.7.2 See merge request gitlab-org/gitlab-ce!24771
| * | | Update `chart.js` to 2.7.2Andrew Fontaine2019-02-088-88/+219
|/ / /
* | | Merge branch 'qa-staging-33-wait-for-viewers-to-load' into 'master'Mark Lapierre2019-02-083-2/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix push_http_private_token_spec by waiting for viewers to load Closes gitlab-org/quality/staging#33 See merge request gitlab-org/gitlab-ce!25030
| * | | Wait for viewers to loadqa-staging-33-wait-for-viewers-to-loadSanad Liaquat2019-02-083-2/+16
| | |/ | |/| | | | | | | | | | Adds qa-spinner class and wait for it to go away before making assertions.
* | | Merge branch 'docs/container-registry-api-introduced' into 'master'Marcia Ramos2019-02-081-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Mention when the Registry API was introduced See merge request gitlab-org/gitlab-ce!24596
| * | | Mention when the Registry API was introducedAchilleas Pipinellis2019-02-081-1/+3
|/ / /
* | | Merge branch 'mr-web-worker-origin' into 'master'Filipa Lacerda2019-02-083-10/+14
|\ \ \ | | | | | | | | | | | | | | | | Fixes diff web worker not loading in staging See merge request gitlab-org/gitlab-ce!25039
| * | | Fixes diff web worker not loading in stagingPhil Hughes2019-02-083-10/+14
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/quality/staging/issues/34
* | | | Merge branch 'docs-branches-api-search' into 'master'Achilleas Pipinellis2019-02-081-5/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarify search parameter in the branches API docs See merge request gitlab-org/gitlab-ce!24703
| * | | | Clarify search parameter in the branches API docsdocs-branches-api-searchLukas Eipert2019-01-301-5/+4
| | | | |
* | | | | Merge branch 'patch-40' into 'master'Achilleas Pipinellis2019-02-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update group permission docs See merge request gitlab-org/gitlab-ce!24768
| * | | | | Add that "developer" permissions level can create projects in a group.patch-40Caroline Wainaina2019-01-291-1/+1
| | | | | |
* | | | | | Merge branch 'patch-41' into 'master'Achilleas Pipinellis2019-02-081-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add link to API for GitHub imports See merge request gitlab-org/gitlab-ce!24808
| * | | | | | Add link to API for GitHub importspatch-41Blair Lunceford2019-01-301-0/+1
| | | | | | |
* | | | | | | Merge branch 'winh-draft_note_spec-vue-test-utils' into 'master'Phil Hughes2019-02-081-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor draft_note_spec.js to Vue test utils (CE backport) See merge request gitlab-org/gitlab-ce!25016
| * | | | | | | Refactor draft_note_spec.js to Vue test utils (CE backport)Winnie Hellmann2019-02-081-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'docs/fix-anchor-link' into 'master'Achilleas Pipinellis2019-02-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Fixes link to wrong section See merge request gitlab-org/gitlab-ce!24811
| * | | | | | Fixes link to wrong sectiondocs/fix-anchor-linkEvan Read2019-01-311-1/+1
| | | | | | |
* | | | | | | Merge branch 'docs/uplift-broadcast-messages-api-doc' into 'master'Achilleas Pipinellis2019-02-082-35/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor broadcast message API page See merge request gitlab-org/gitlab-ce!24920
| * | | | | | | Refactor broadcast message API pagedocs/uplift-broadcast-messages-api-docEvan Read2019-02-052-35/+68
| | | | | | | |
* | | | | | | | Merge branch 'docs/uplift-snippets-api-doc' into 'master'Achilleas Pipinellis2019-02-082-71/+152
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor snippets API documentation page See merge request gitlab-org/gitlab-ce!24921
| * | | | | | | | Refactor snippets API documentation pageEvan Read2019-02-082-71/+152
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/fix-anchors-for-manual-actions' into 'master'Achilleas Pipinellis2019-02-084-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix many 'when manual' anchors See merge request gitlab-org/gitlab-ce!24947
| * | | | | | | | Fix many 'when manual' anchorsdocs/fix-anchors-for-manual-actionsEvan Read2019-02-064-5/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'remove_make_updated_cluster_applications' into 'master'Douglas Barbosa Alexandre2019-02-082-35/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove #make_updated! as have #make_installed! now Closes #57374 See merge request gitlab-org/gitlab-ce!24988
| * | | | | | | | | Remove #make_updated! as have #make_installed! nowremove_make_updated_cluster_applicationsThong Kuah2019-02-082-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can have multiple and conditional transistions in a event, so make use of that.
* | | | | | | | | | Merge branch 'patch-44' into 'master'Marcia Ramos2019-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: trivial: remove stray extra "to" See merge request gitlab-org/gitlab-ce!25024
| * | | | | | | | | | docs: remove stray extra "to"Andrew Petro2019-02-071-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'move-permission-check-manual-actions-on-deployments' into 'master'Filipa Lacerda2019-02-0817-50/+48
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move permission check of manual actions of deployments Closes #52412 See merge request gitlab-org/gitlab-ce!24660
| * | | | | | | | | | Move permission check of manual actions of deploymentsShinya Maeda2019-02-0817-50/+48
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/fix-spelling-in-internationalisation-section' into 'master'Achilleas Pipinellis2019-02-083-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling and other minor improvements See merge request gitlab-org/gitlab-ce!24813
| * | | | | | | | | | Fix spelling and other minor improvementsdocs/fix-spelling-in-internationalisation-sectionEvan Read2019-01-313-5/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-40' into 'master'Achilleas Pipinellis2019-02-081-25/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update index.md See merge request gitlab-org/gitlab-ce!24698
| * | | | | | | | | | | Update index.mdRajakavitha Kodhandapani2019-02-081-25/+19
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/fix-anchor-landing-page' into 'master'Achilleas Pipinellis2019-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anchor link was incorrect See merge request gitlab-org/gitlab-ce!24922
| * | | | | | | | | | | Anchor link was incorrectdocs/fix-anchor-landing-pageEvan Read2019-02-051-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2019-02-081-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: capitalization fixes in Gitaly docs See merge request gitlab-org/gitlab-ce!24994
| * | | | | | | | | | | docs: capitalization fixes in GitalyBen Bodenmiller2019-02-071-9/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-40' into 'master'Grzegorz Bizon2019-02-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dotNet test task to upload test results on failure See merge request gitlab-org/gitlab-ce!24591
| * | | | | | | | | | | | Update dotNet test task to upload test results on failurePatrick Galbraith2019-01-231-0/+1
| | | | | | | | | | | | |