summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.9.8v11.9.8GitLab Release Tools Bot2019-04-111-1/+1
|
* Update CHANGELOG.md for 11.9.8GitLab Release Tools Bot2019-04-115-20/+16
| | | [ci skip]
* Merge branch '11-9-stable-patch-8' into '11-9-stable'John Skarbek2019-04-1152-62/+1560
|\ | | | | | | | | Prepare 11.9.8 release See merge request gitlab-org/gitlab-ce!27253
| * Merge branch 'restore-hipchat-11-9' into '11-9-stable'11-9-stable-patch-8John Jarvis2019-04-1126-27/+963
| | | | | | | | | | [11.9] Revert "Remove HipChat integration from GitLab" See merge request gitlab-org/gitlab-ce!27257
| * Merge branch 'sh-disable-diff-instrumentation' into 'master'Michael Kozono2019-04-112-1/+5
| | | | | | | | | | | | | | | | | | | | | | Disable method instrumentation for diffs Closes #52898 See merge request gitlab-org/gitlab-ce!27235 (cherry picked from commit b9e6e72501173c29a30ee1b4a2afb9ee9d3b1117) b397ad8a Disable method instrumentation for diffs
| * Merge branch 'fix-pull-request-importer' into 'master'Kamil Trzciński2019-04-113-1/+79
| | | | | | | | | | | | | | | | | | Improve performance of PR import See merge request gitlab-org/gitlab-ce!27121 (cherry picked from commit f15caf0109998308e7f960baaa541d73be8bcacb) f3ad51f8 Improve performance of PR import
| * Merge branch 'allow-to-use-untrusted-ruby-syntax' into 'master'Sean McGivern2019-04-119-25/+223
| | | | | | | | | | | | | | | | | | Allow to use untrusted ruby syntax See merge request gitlab-org/gitlab-ce!26905 (cherry picked from commit 7dcc3003119666c75a35c27d73ffb297c696fcc8) 9bc4fbf1 Allow to use untrusted Regexp via feature flag
| * Merge branch 'fj-59547-fix-has-commits' into 'master'Nick Thomas2019-04-112-4/+11
| | | | | | | | | | | | | | | | | | | | | | Fix MergeRequest#has_commits? nil comparison Closes #59547 See merge request gitlab-org/gitlab-ce!26828 (cherry picked from commit b224efe767e4f8e24b51b87753f55bf6d3129f68) 6645b825 Fix MergeRequest#commits_count nil comparison
| * Merge branch 'id-mr-list-when-filtered-by-approvers-only' into 'master'Douglas Barbosa Alexandre2019-04-115-4/+64
| | | | | | | | | | | | | | | | | | Consider array params on rendering MR list on dashboard See merge request gitlab-org/gitlab-ce!26623 (cherry picked from commit 7926384ff32b9ad8833dcfffc9bb87d036c4bd21) b3f5413a Consider array params on rendering MR list on dashboard
| * Merge branch 'docs-google_secure_ldap' into 'master'Evan Read2019-04-115-0/+215
| | | | | | | | | | | | | | | | | | Add documentation for Google Secure LDAP See merge request gitlab-org/gitlab-ce!26064 (cherry picked from commit 13ace389787f21b847ca09eccc194c3b08a7ea86) 1a0856ea Add documentation for Google Secure LDAP
* | Revert "Merge branch 'restore-hipchat-11-9' into '11-9-stable'"John Jarvis2019-04-1126-963/+27
| | | | | | | | | | This reverts commit 348d5a1d5cb1efe94592efe811c074c5164e8404, reversing changes made to 93e321569a898d9701a251b4bb73ad56b79fc535.
* | Merge branch 'restore-hipchat-11-9' into '11-9-stable'John Jarvis2019-04-1126-27/+963
|\ \ | |/ |/| | | | | [11.9] Revert "Remove HipChat integration from GitLab" See merge request gitlab-org/gitlab-ce!27257
| * Restore index on services.typeSean McGivern2019-04-112-0/+21
| |
| * Add frozen_string_literal to HipChat filesSean McGivern2019-04-113-0/+5
| |
| * Add changelog entrySean McGivern2019-04-111-0/+5
| |
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-1127-48/+953
|/ | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* Update VERSION to 11.9.7v11.9.7GitLab Release Tools Bot2019-04-091-1/+1
|
* Update CHANGELOG.md for 11.9.7GitLab Release Tools Bot2019-04-091-0/+4
| | | [ci skip]
* Update VERSION to 11.9.6v11.9.6GitLab Release Tools Bot2019-04-041-1/+1
|
* Update CHANGELOG.md for 11.9.6GitLab Release Tools Bot2019-04-045-20/+13
| | | [ci skip]
* Merge branch '11-9-stable-patch-6' into '11-9-stable'John Skarbek2019-04-046-17/+28
|\ | | | | | | | | Prepare 11.9.6 release See merge request gitlab-org/gitlab-ce!26942
| * Revert "Update CHANGELOG.md for 11.9.5"11-9-stable-patch-6John T Skarbek2019-04-035-10/+21
| | | | | | | | This reverts commit 15657f6ff77552f58988b76838408737218d5b1c.
| * Merge branch 'leipert-hotfix-ci-yml' into 'master'Stan Hu2019-04-031-7/+7
|/ | | | | | | | | Fix GitLab CI branch matching pattern See merge request gitlab-org/gitlab-ce!26777 (cherry picked from commit 65f2ed1de20abbb31b18524004164f1de3de4194) 23618d91 Fix GitLab CI branch matching pattern
* Update VERSION to 11.9.5v11.9.5GitLab Release Tools Bot2019-04-031-1/+1
|
* Update CHANGELOG.md for 11.9.5GitLab Release Tools Bot2019-04-035-20/+13
| | | [ci skip]
* Removing security-milestone-labels.yml from ee/ dir on gitlab-ceJohn Jarvis2019-04-031-5/+0
|
* Merge branch '11-9-stable-patch-5' into '11-9-stable'John Jarvis2019-04-0326-87/+147
|\ | | | | | | | | Prepare 11.9.5 release See merge request gitlab-org/gitlab-ce!26866
| * Merge branch 'remove-expand-diff-feature-flag' into 'master'11-9-stable-patch-5Filipa Lacerda2019-04-024-13/+2
| | | | | | | | | | | | Remove expand diff to full file feature flag See merge request gitlab-org/gitlab-ce!26614
| * Merge branch 'weimeng-master-patch-83366' into 'master'Stan Hu2019-04-021-1/+4
| | | | | | | | | | | | | | | | | | Fix attempting to drop views in PostgreSQL See merge request gitlab-org/gitlab-ce!26836 (cherry picked from commit 264a6299583d32af41bd321b275d93a728bcaf72) cfc6d252 Fix attempting to drop views in PostgreSQL
| * Merge branch 'sh-fix-rugged-tree-entries' into 'master'Sean McGivern2019-04-023-9/+18
| | | | | | | | | | | | | | | | | | | | | | Avoid excessive recursive calls with Rugged TreeEntries Closes #59759 See merge request gitlab-org/gitlab-ce!26813 (cherry picked from commit d7583addf21cd4299363a5ce64126c37ca4234ea) 8686e012 Avoid excessive recursive calls with Rugged TreeEntries
| * Merge branch 'sh-force-gc-after-import' into 'master'Douglas Barbosa Alexandre2019-04-025-3/+24
| | | | | | | | | | | | | | | | | | | | | | Force a full GC after importing a project Closes #59477 See merge request gitlab-org/gitlab-ce!26803 (cherry picked from commit 57cba4d1e9e9964359a5c55bca6558db0d511d98) d4c6a3af Force a full GC after importing a project
| * Merge branch 'sh-fix-project-branches-merge-status' into 'master'Douwe Maan2019-04-023-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | Fix API /project/:id/branches not returning correct merge status Closes #56250 See merge request gitlab-org/gitlab-ce!26785 (cherry picked from commit 2db4e79f2825408f99e4f070bc3393de9b4cace3) cedbb336 Fix API /project/:id/branches not returning correct merge status 2675581c Revise merged branch check to green light up to N branches
| * Merge branch 'jira-transition-id-field' into 'master'Evan Read2019-04-021-1/+1
| | | | | | | | | | | | | | | | | | Jira Services Doc update to String See merge request gitlab-org/gitlab-ce!26683 (cherry picked from commit d69b12f9f69109e44a7945fc8c886de26425c1a9) 9afdca3c Jira Services Doc update to String
| * Merge branch 'recreate-all-diffs-on-import' into 'master'Yorick Peterse2019-04-023-43/+56
| | | | | | | | | | | | | | | | | | | | | | Force to recreate all diffs on import Closes #59353 See merge request gitlab-org/gitlab-ce!26480 (cherry picked from commit afb6e8e3ef4e29113f79e2f38f781b4a6f42a4c7) 7fbfb199 Force to recreate all diffs on import
| * Merge branch 'remove-cng-job' into 'master'Robert Speicher2019-04-021-1/+1
| | | | | | | | | | | | | | | | | | Remove cloud-native-job from CI See merge request gitlab-org/gitlab-ce!25605 (cherry picked from commit 04496085c1b83ccf5d9bfa546daf2a92e9c644e7) a1912444 Make cloud release job manual, as a fallback
| * Merge branch 'qa-allow-gitlab-qa-pat-env-var' into 'master'Rémy Coutable2019-04-025-11/+11
|/ | | | | | | | | Allow personal access token env var from gitlab-qa See merge request gitlab-org/gitlab-ce!24048 (cherry picked from commit 7732db2249da843cd87e4cdd3d6f968d66c0586f) 0093b099 Allow token env var from gitlab-qa
* Update VERSION to 11.9.4v11.9.4GitLab Release Tools Bot2019-03-281-1/+1
|
* Update CHANGELOG.md for 11.9.4GitLab Release Tools Bot2019-03-289-40/+14
| | | [ci skip]
* Revert "Update CHANGELOG.md for 11.9.3"Robert Speicher2019-03-289-11/+41
| | | | This reverts commit 894d90c7a22d295105a45c0450806c9b0a0701a4.
* Merge branch 'security-exif-fix-orientation-11-9' into '11-9-stable'GitLab Release Tools Bot2019-03-282-1/+2
|\ | | | | | | | | Preserve Orientation when removing EXIF See merge request gitlab/gitlabhq!3048
| * Preserve Orientation when removing EXIFJan Provaznik2019-03-282-1/+2
|/
* Update VERSION to 11.9.3v11.9.3GitLab Release Tools Bot2019-03-271-1/+1
|
* Update CHANGELOG.md for 11.9.3GitLab Release Tools Bot2019-03-279-40/+14
| | | [ci skip]
* Add empty 11.9.2 changelog entryRobert Speicher2019-03-271-0/+4
| | | | [ci skip]
* Revert "Update CHANGELOG.md for 11.9.2"Robert Speicher2019-03-279-14/+40
| | | | This reverts commit faab4d4b997d892c917e288d5a91f5444d51a49a.
* Update VERSION to 11.9.2v11.9.2GitLab Release Tools Bot2019-03-261-1/+1
|
* Update CHANGELOG.md for 11.9.2GitLab Release Tools Bot2019-03-269-40/+14
| | | [ci skip]
* Merge branch 'security-55503-fix-pdf-js-11-9' into '11-9-stable'Yorick Peterse2019-03-268-32169/+50870
|\ | | | | | | | | Fix PDF.js vulnerability See merge request gitlab/gitlabhq!3024
| * Updated PDF.js to 2.0.943Natalia Tepluhina2019-03-208-32169/+50870
| | | | | | | | | | | | | | | | fix: changed PDFJS prop to GlobalWorkerOptions Fixed pdf tests Added changelog entry
* | Merge branch 'security-mass-assignment-on-project-update-11-9' into ↵Yorick Peterse2019-03-263-5/+30
|\ \ | | | | | | | | | | | | | | | | | | '11-9-stable' Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3033
View Lorry Controller Status