summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-related-merge-requests-path' into 'master'11-10-stable-patch-6Rémy Coutable2019-06-034-1/+44
| | | | | | | | Use a path for the related merge requests endpoint Closes #61280 See merge request gitlab-org/gitlab-ce!28171
* Merge branch 'use-source-ref-name-in-webhook' into 'master'Ash McKenzie2019-06-033-1/+15
| | | | | | | | | | | Use source ref in pipeline webhook Closes #61553 See merge request gitlab-org/gitlab-ce!28772 (cherry picked from commit 2714f85c1287e560d38c8de9f1f17c3aa3d4c8df) 7e05f3b7 Use source ref for pipeline webhook
* Merge branch '60778-input-text-height' into 'master'Filipa Lacerda2019-06-033-0/+10
| | | | | | | | | | | Fix height of input groups Closes #61304, #61303, #59254, and #60778 See merge request gitlab-org/gitlab-ce!28495 (cherry picked from commit 52758b929fa71540f97cd241d1668ade795306a1) 360646ea Fix height of input groups
* Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'Douglas Barbosa Alexandre2019-06-033-1/+10
| | | | | | | | | | | API: Fix recursive flag not working with Rugged get_tree_entries flag Closes #61979 See merge request gitlab-org/gitlab-ce!28494 (cherry picked from commit d951f047198d3ee03604fb64f6ad96efae6cba54) c1827f1c API: Fix recursive flag not working with Rugged get_tree_entries flag
* Merge branch 'fix-project-visibility-level-validation' into 'master'Stan Hu2019-06-033-2/+18
| | | | | | | | | | | Fix project visibility level validation Closes #59379 See merge request gitlab-org/gitlab-ce!28305 (cherry picked from commit 99637084b22abdf7b1f6d46daad80faf8181f3cd) b5540112 Fix project visibility level validation
* Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-06-032-2/+2
| | | | | | | | | | | Don't run full gc in AfterImportService Closes gitlab-ee#11556 See merge request gitlab-org/gitlab-ce!28239 (cherry picked from commit 4c16ce118498a2e3b98ad069000031fa9c55fcd3) 36b1a2d7 Don't run full gc in AfterImportService
* Merge branch ↵Robert Speicher2019-06-031-0/+6
| | | | | | | | | | | 'ce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-error' into 'master' Add remove_foreign_key_if_exists See merge request gitlab-org/gitlab-ce!28172 (cherry picked from commit 7b7416d9862f52fe0f0a304eeeaaa4b8d65bc8eb) 24eff5e0 Add remove_foreign_key_if_exists
* Merge branch '61203-fix-lfs-ui-upload' into 'master'Nick Thomas2019-06-033-1/+32
| | | | | | | | | | | | Fix uploading of LFS tracked file through UI Closes #61203 See merge request gitlab-org/gitlab-ce!28052 (cherry picked from commit 4d2d812463256003ab943df90a9c603821078a69) 3f192e8a Fix Lfs::FileTransformer to work with file objects 48fcdf1f Add changelog entry
* Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-06-036-5/+20
| | | | | | | | | | | Allow a member to have an access level equal to parent group Closes gitlab-ee#11323 See merge request gitlab-org/gitlab-ce!27913 (cherry picked from commit 2b3b0bb1847e5d910b3e5dc5e151f194c12d3907) 32ddc3fe Allow a member to have an access level equal to parent group
* Merge branch 'sh-11-10-upgrade-chrome-v73' into '11-10-stable-patch-6'John Jarvis2019-06-033-2/+9
|\ | | | | | | | | Upgrade CI to use Chrome V73 See merge request gitlab-org/gitlab-ce!27863
| * Upgrade CI to use Chrome V73sh-11-10-upgrade-chrome-v73Stan Hu2019-04-291-2/+2
| | | | | | | | | | | | This backports https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27762 into the 11-10-stable branch in the hopes it resolves a number of flaky tests.
| * Fix search dropdown being hidden immediatelyHeinrich Lee Yu2019-04-291-0/+2
| |
| * Gracefully handle undefined data in getTreeEntries()Stan Hu2019-04-291-0/+5
| |
* | Merge branch 'sh-gitaly-update-for-11-10' into '11-10-stable-patch-6'John Jarvis2019-06-032-1/+6
|\ \ | | | | | | | | | | | | [11.10] Use 3-way merge for squashing commits See merge request gitlab-org/gitlab-ce!28078
| * | Use 3-way merge for squashing commitssh-gitaly-update-for-11-10Stan Hu2019-05-032-1/+6
| | | | | | | | | | | | This upgrades Gitaly to 1.34.2 for 11-10-stable.
* | | Merge branch '62283-fix-job-app-spec' into 'master'11-10-stable-patch-5Filipa Lacerda2019-05-241-1/+4
|/ / | | | | | | | | | | | | Replaces a hard-coded date in the job app spec Closes #62283 See merge request gitlab-org/gitlab-ce!28709
* | Update VERSION to 11.10.4v11.10.4GitLab Release Tools Bot2019-05-011-1/+1
| |
* | Update CHANGELOG.md for 11.10.4GitLab Release Tools Bot2019-05-0115-71/+23
| | | | | | [ci skip]
* | Merge branch '11-10-stable-patch-4' into '11-10-stable'John Jarvis2019-05-0115-20/+272
|\ \ | | | | | | | | | | | | Prepare 11.10.4 release See merge request gitlab-org/gitlab-ce!27927
| * | Merge branch 'fix-ref-text-of-mr-pipelines' into 'master'Ash McKenzie2019-04-305-15/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines for merge requests does not show pipeline page when source branch is removed Closes #60432 See merge request gitlab-org/gitlab-ce!27803 (cherry picked from commit a2543ee29a97f61f960994d473291c7224c50c3d) 96b28d83 Fix ref_text of merge request pipelines
| * | Merge branch 'fix-environment-on-stop-not-work' into 'master'Sean McGivern2019-04-3010-5/+169
|/ / | | | | | | | | | | | | | | | | | | | | `on_stop` is not automatically triggered with pipelines for merge requests Closes #60885 See merge request gitlab-org/gitlab-ce!27618 (cherry picked from commit 2432a540cff461c5d9c0346dd4021229078d674d) daa8f784 Fix environment automatic on_stop trigger
* | Merge remote-tracking branch 'origin/11-10-stable' into 11-10-stableJohn T Skarbek2019-04-3058-87/+512
|\ \
| * \ Merge branch '11-10-stable-patch-3' into '11-10-stable'John Jarvis2019-04-3058-87/+512
| |\ \ | | |/ | | | | | | | | | Prepare 11.10.3 release See merge request gitlab-org/gitlab-ce!27841
| | * Merge branch '60605-karma-failing' into 'master'Michael Kozono2019-04-291-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Karma failing with MrWidgetAlertMessage when helpPath is provided Maximum call stack size exceeded" Closes #60605 See merge request gitlab-org/gitlab-ce!27429 (cherry picked from commit b008942cf61ecada799e3c660cf536a4a5cac65a) 500fd226 Add sync: false to fix Karma tests
| | * Revert "Merge branch 'docs-review-MR27275' into 'master'"John T Skarbek2019-04-291-22/+9
| | | | | | | | | | | | This reverts commit 2ee9b14155d42141b5909306d0758661d2092ae5.
| | * Merge branch '11-10-stable-ie11-fix' into '11-10-stable-patch-3'John Skarbek2019-04-292-5/+5
| | |\ | | | | | | | | | | | | | | | | Update gitlab-ui to 3.2.0-hotfix.1 See merge request gitlab-org/gitlab-ce!27830
| | | * Update gitlab-ui to 3.2.0-hotfix.1Clement Ho2019-04-292-5/+5
| | |/ | |/|
| | * Merge branch 'update-workhorse-11-10' into '11-10-stable-patch-3'John Skarbek2019-04-292-1/+6
| | |\ | | | | | | | | | | | | | | | | Update workhorse to v8.5.2 See merge request gitlab-org/gitlab-ce!27631
| | | * Update Workhorse to v8.5.2Nick Thomas2019-04-292-1/+6
| | |/
| | * Merge branch 'fix-ci-commit-ref-name-and-slug' into 'master'Sean McGivern2019-04-2910-8/+119
| | | | | | | | | | | | | | | | | | | | | | | | Make `CI_COMMIT_REF_NAME` and `SLUG` variable idempotent Closes #60822 See merge request gitlab-org/gitlab-ce!27663
| | * Merge branch 'docs-review-MR27275' into 'master'Achilleas Pipinellis2019-04-291-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | Docs: review MR !27275 Closes #60631 See merge request gitlab-org/gitlab-ce!27585
| | * Merge branch 'sh-fix-slow-partial-rendering' into 'master'Sean McGivern2019-04-297-2/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix slow performance with compiling HAML templates Closes gitlab-ee#11198 See merge request gitlab-org/gitlab-ce!27782 (cherry picked from commit fe45f5446f2aefda2066bd4d271ae47162130049) b02458ef Fix slow performance with compiling HAML templates fad99d93 Add Rubocop rule to ban include ActionView::Context
| | * Merge branch 'lock-pipeline-schedule-worker' into 'master'Stan Hu2019-04-293-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent concurrent execution of PipelineScheduleWorker Closes gitlab-com/gl-infra/production#805 See merge request gitlab-org/gitlab-ce!27781 (cherry picked from commit ca8e5aded8e5e63b97a511ca7e50cc981ac7c4dd) 28f78540 Prevent concurrent execution of PipelineScheduleWorker
| | * Merge branch ↵Kamil Trzciński2019-04-292-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60945-masked-variable-still-printed-in-log-output-on-gitlab-com' into 'master' Resolve "Masked Variable still printed in log output on gitlab.com" Closes #60945 See merge request gitlab-org/gitlab-ce!27768 (cherry picked from commit 6246979a8659cef67533a5033755a45ad72d30c5) 07b5c503 Remove variable masking feature flag
| | * Merge branch 'winh-boards-drag-selection' into 'master'Annabel Dunstone Gray2019-04-294-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent text selection when dragging in issue boards Closes #59378 See merge request gitlab-org/gitlab-ce!27724 (cherry picked from commit fd05b2c9d63704d3564a090d1f00395abf259cb4) 21116346 Add vendor prefixes for user-select
| | * Merge branch '60821-deployment-jobs-broken-as-of-11-10-0' into 'master'Douwe Maan2019-04-293-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deployment jobs broken as of 11.10.0" Closes #60821 See merge request gitlab-org/gitlab-ce!27687 (cherry picked from commit 6885419a48c39ab9f38aea13ec1900b10bce7d80) 825d7596 Fix deployments for Kubernetes service templates
| | * Merge branch 'ce-fl-fix-missing-required-prop' into 'master'Phil Hughes2019-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Adds missing prop See merge request gitlab-org/gitlab-ce!27671 (cherry picked from commit 336a0a8745e7eb1bb38c6f6f0ec7832569b041bf) c31e95a2 Adds missing prop
| | * Merge branch '60906-fix-wiki-links' into 'master'Stan Hu2019-04-293-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use wiki partial in search results Closes #60906 See merge request gitlab-org/gitlab-ce!27634 (cherry picked from commit f04f6909cebac79704081bc4787099c613a70cf7) d60d50d6 Use wiki partial in search results
| | * Merge branch 'sh-update-rugged-backport-docs' into 'master'Marcia Ramos2019-04-291-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update NFS docs to reflect new Rugged backports See merge request gitlab-org/gitlab-ce!27632 (cherry picked from commit 99a6932e66dd1009c32aff54598f5f55fd5dbd32) 9ec75396 Update NFS docs to reflect new Rugged backports
| | * Merge branch 'fj-60827-fix-web-strategy-error' into 'master'Stan Hu2019-04-293-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when project export to remote url fails Closes #60827 See merge request gitlab-org/gitlab-ce!27614 (cherry picked from commit 90ddfda612eba5533dccebbba205bac9dd8f0ac6) aa0345a4 Fix error info retrieval on web project export
| | * Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'Filipa Lacerda2019-04-293-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "MR Popover is not attached in system notes" Closes #60855 See merge request gitlab-org/gitlab-ce!27589 (cherry picked from commit 55767af463441744140d3fbfd44b00026ed83350) 41ff0d1e Init MR Popovers onmount of system note
| | * Merge branch '60687-enviro-dropdown' into 'master'Fatih Acet2019-04-294-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586 (cherry picked from commit 0f863c68bb8bc5054a22e0c553a933c83bea4df6) e4d1f5d3 Fix Metrics environments dropdown
| | * Merge branch 'id-feature-flag-to-disable-lfs-check' into 'master'Douwe Maan2019-04-292-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature flag to disable LFS check Closes #60588 See merge request gitlab-org/gitlab-ce!27451 (cherry picked from commit 6c913f2c65ec4ddffaf4a79fc15ea933325e51f4) 681db75b Add feature flag to disable LFS check a26c5efe Apply suggestion to spec/lib/gitlab/checks/lfs_check_spec.rb
| | * Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' ↵Stan Hu2019-04-293-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "500 error on save of general pipeline settings timeout" Closes gitlab-ee#11281 See merge request gitlab-org/gitlab-ce!27416 (cherry picked from commit 23e5d9edcee5c0504bec9aade0e5abbb86ce06b1) 163730f0 Redirect to settings page on invalid update ef67a54a Add CHANGELOG entry
| | * Merge branch '60540-merge-request-popover-is-not-working-on-the-to-do-page' ↵Phil Hughes2019-04-295-10/+53
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge Request Popover is not working on the To Do page" Closes #60540 See merge request gitlab-org/gitlab-ce!27382 (cherry picked from commit 6015b521751ba1f272fbc7160cd138fe4411c8ee) 5e38e42b Make sure to allow project information data tags on GFM 18885d50 Do not show MR Popover if all necessary data is not present
* | Update VERSION to 11.10.3v11.10.3GitLab Release Tools Bot2019-04-301-1/+1
| |
* | Update CHANGELOG.md for 11.10.3GitLab Release Tools Bot2019-04-302-5/+7
| | | | | | [ci skip]
* | Merge branch ↵GitLab Release Tools Bot2019-04-297-182/+224
|\ \ | |/ |/| | | | | | | | | 'security-disallow-read-user-scope-to-read-project-events-11-10' into '11-10-stable' Disallow read user scope to read project events See merge request gitlab/gitlabhq!3086
| * Fix specsMałgorzata Ksionek2019-04-251-2/+2
| |
| * Add new api class for projects eventsMałgorzata Ksionek2019-04-247-182/+224
| | | | | | | | | | | | | | | | | | | | | | | | Refactor api events class to use external helper Move specs from old class Add changelog and magic string Refactor events class to be more explicit Remove blank line