summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.1.7v10.1.710-1-stableOswaldo Ferreira2018-01-181-1/+1
|
* Update CHANGELOG.md for 10.1.7Oswaldo Ferreira2018-01-181-0/+4
| | | [ci skip]
* Merge branch 'fj-42112-fix-deploy-keys-migration-mysql-10-1' into '10-1-stable'Stan Hu2018-01-173-28/+111
|\ | | | | | | | | [10.1] Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16528
| * [10.1] Fix bug in security release with deploy keys migrationFrancisco Javier López2018-01-173-28/+111
|/
* Update VERSION to 10.1.6v10.1.6Oswaldo Ferreira2018-01-111-1/+1
|
* Update CHANGELOG.md for 10.1.6Oswaldo Ferreira2018-01-119-41/+14
| | | [ci skip]
* Merge branch '10-1-stable-patch-6' into '10-1-stable'Oswaldo Ferreira2018-01-1092-273/+1250
|\ | | | | | | | | Prepare 10.1.6 Security Release See merge request gitlab/gitlabhq!2291
| * Merge branch 'jej/fix-disabled-oauth-access-10-1' into 'security-10-1'Robert Speicher2018-01-098-13/+118
| | | | | | | | | | | | | | | | | | [10.1] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2249 (cherry picked from commit e4951cc45f29a9ec1e07408102ab339444ff43e8) 71d8d00c Prevents login with disabled OAuth providers
| * Merge branch 'fl-ipython' into 'security-10-1'Phil Hughes2018-01-097-4/+206
| | | | | | | | | | | | | | | | | | Port of [10.2] Sanitizes IPython notebook output See merge request gitlab/gitlabhq!2284 (cherry picked from commit 72ce40bdebe73a06dc282d42f2c8a729730c9cee) 989d1187 Port of [10.2] Sanitizes IPython notebook output
| * Merge branch ↵Robert Speicher2018-01-085-1/+28
| | | | | | | | | | | | | | | | | | | | | | '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook-10-1' into 'security-10-1' [10.1] Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2286 (cherry picked from commit 271ef222fa964481379a14a9c07805621a7d52a6) a30812d3 Don't allow line breaks on HTTP headers
| * Merge branch 'fix/import-rce-10-1' into 'security-10-1'James Lopez2018-01-085-16/+68
| | | | | | | | | | | | | | | | | | [10.1] Fix RCE via project import mechanism See merge request gitlab/gitlabhq!2292 (cherry picked from commit 9a399c554268f3ac9e9cd2340600c2df2f5dfa47) fdbd8d03 Fix RCE via project import mechanism
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-1' into ↵Douwe Maan2018-01-0831-137/+380
| | | | | | | | | | | | | | | | | | | | | | 'security-10-1' [10.1] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2274 (cherry picked from commit b8ed2ac5bf4a75d0787315e741d4c9aacd36e07e) 5f214517 Backport to 10.1
| * Merge branch '41567-projectfix-10-1' into 'security-10-1'Sean McGivern2018-01-088-20/+133
| | | | | | | | | | | | | | | | | | [10.1] backport - check project access on MR create See merge request gitlab/gitlabhq!2280 (cherry picked from commit 6ca3de3c1e97590f62677227c7eef2f000db766c) 285551b9 check project access on MR create
| * Merge branch 'security-ac/fix-path-traversal-10-1' into 'security-10-1'Robert Speicher2018-01-084-2/+83
| | | | | | | | | | | | | | | | | | [10.1] Fix path traversal in gitlab-ci.yml cache:key See merge request gitlab/gitlabhq!2272 (cherry picked from commit 991ae1d593e78e7c2484d5fe5b12dfce44a94bc8) 754c83ea Fix path traversal in gitlab-ci.yml cache:key
| * Merge branch 'sh-validate-path-project-import-10-1' into 'security-10-1'Robert Speicher2018-01-084-2/+71
| | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.1 port See merge request gitlab/gitlabhq!2266 (cherry picked from commit 14e7f46a07a45bf851178ae6c90c519460bf9736) 13ad8b50 Validate project path in Gitlab import
| * Merge branch 'milestones-finder-order-fix-10-1' into 'security-10-1'Robert Speicher2018-01-087-54/+43
| | | | | | | | | | | | | | | | | | Remove order param from the MilestoneFinder - 10.1 port See merge request gitlab/gitlabhq!2265 (cherry picked from commit 5f0bb7928b40029a2ced18063c36697e3f8e80c2) 85c6530e Remove order param from the MilestoneFinder
| * Merge branch 'label-xss-10-1' into 'security-10-1'Jacob Schatz2018-01-082-1/+11
| | | | | | | | | | | | | | | | | | | | [10.1] Fix XSS in issue label dropdown See merge request gitlab/gitlabhq!2252 (cherry picked from commit 447270c2603dc4962d6aed87baeaeb56c59788ba) 71c6cded Fix XSS in issue label dropdown 0cc81a51 Move xss_label to smaller test scope
| * Merge branch 'ac/41346-xss-ci-job-output-backport-10-1' into 'security-10-1'Robert Speicher2018-01-083-5/+57
| | | | | | | | | | | | | | | | | | [10.1] Fix XSS vulnerability in Pipeline job trace - back port 10.1 See merge request gitlab/gitlabhq!2261 (cherry picked from commit ddb49b9053a31db0dfb93e02be1975549f991695) dc3d4676 Fix XSS vulnerability in Pipeline job trace
| * Merge branch ↵Sean McGivern2018-01-089-18/+52
|/ | | | | | | | | | | 'security-10-1-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-1' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2283 (cherry picked from commit cde3ae62e8f602b8db4fbdd382fba1a90780be7f) c958086d Filter out sensitive fields from the project services API
* Merge branch 'sh-bump-redis-actionpack' into 'master'Robert Speicher2018-01-032-15/+15
| | | | | | | Bump redis-rails to 5.0.2 to get redis-store security updates Closes #40889 See merge request gitlab-org/gitlab-ce!15773
* Merge branch 'winh-10-1-changelog-entries-docs' into '10-1-stable'Michael Kozono2017-12-181-0/+34
|\ | | | | | | | | Add changelog entries for 10.1.5 See merge request gitlab-org/gitlab-ce!15908
| * Add changelog entries for 10.1.5 and 10.0.7Winnie Hellmann2017-12-181-0/+34
|/
* Update VERSION to 10.1.4v10.1.4Felipe Artur2017-11-141-1/+1
|
* Update CHANGELOG.md for 10.1.4Felipe Artur2017-11-145-21/+10
| | | [ci skip]
* Merge branch '10-1-stable-patch-4' into '10-1-stable'Felipe Artur2017-11-1412-10/+116
|\ | | | | | | | | Prepare 10.1.4 release See merge request gitlab-org/gitlab-ce!15379
| * Merge branch 'dm-authorize-admin-oauth-application' into 'master'Sean McGivern2017-11-142-5/+14
| | | | | | | | | | | | | | Prevent error when authorizing an admin-created OAauth application without a set owner Closes #40086 See merge request gitlab-org/gitlab-ce!15349
| * Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'Yorick Peterse2017-11-143-2/+24
| | | | | | | | | | | | | | Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366
| * Merge branch 'issue_40058' into 'master'Sean McGivern2017-11-143-1/+13
| | | | | | | | | | | | | | Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
| * Merge branch '40092-fix-cluster-size' into 'master'Tim Zallmann2017-11-144-2/+65
|/ | | | | Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359
* Update VERSION to 10.1.3v10.1.310-1-stable-patch-3Felipe Artur2017-11-101-1/+1
|
* Update CHANGELOG.md for 10.1.3Felipe Artur2017-11-1014-67/+16
| | | [ci skip]
* Merge branch '10-1-stable-patch-2' into '10-1-stable'Felipe Artur2017-11-1065-135/+463
|\ | | | | | | | | Prepare 10.1.3 release See merge request gitlab-org/gitlab-ce!15209
| * Merge branch 'issue_39773_be' into 'master'10-1-stable-patch-2Sean McGivern2017-11-103-11/+43
| | | | | | | | | | | | | | Prevent fast forward merge when rebase is required Closes #39773 See merge request gitlab-org/gitlab-ce!15296
| * Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin2017-11-102-1/+7
| |\ | |/ |/| | | | | * 10-1-stable: Merge branch '32059-fix-oauth-phishing' into 'master'
* | Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan2017-11-106-7/+51
| | | | | | | | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab-org/gitlab-ce!15311
| * Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-105-9/+47
| | | | | | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab/gitlabhq!2205
| * Solved conflictsJose Ivan Vargas2017-11-101-69/+1
| |
| * Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin2017-11-101-0/+2
| |\ | |/ |/| | | | | * 10-1-stable: Add 10.1.2 security fixes to CHANGELOG.md
* | Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable'Stan Hu2017-11-091-0/+2
|\ \ | | | | | | | | | | | | Add 10.1.2 security fixes to CHANGELOG.md See merge request gitlab-org/gitlab-ce!15302
| * | Add 10.1.2 security fixes to CHANGELOG.mdmk-add-security-fixes-to-changelog-10-1-stableMichael Kozono2017-11-091-0/+2
|/ /
| * Merge branch '39648-fix-gke-wording' into 'master'Filipa Lacerda2017-11-102-3/+3
| | | | | | | | | | | | | | | | Resolve "Fix GKE wording" Closes #39648 See merge request gitlab-org/gitlab-ce!15204
| * Merge branch 'dm-block-group-and-project-creation-when-external-by-default' ↵Sean McGivern2017-11-103-5/+14
| | | | | | | | | | | | | | | | | | | | into 'master' Make sure group and project creation is blocked for new users that are external by default Closes #39664 See merge request gitlab-org/gitlab-ce!15212
| * Merge branch '38385-gpg-tooltips-not-working-in-safari' into 'master'Jacob Schatz2017-11-103-2/+7
| | | | | | | | | | | | | | Resolve "GPG tooltips not working in Safari" Closes #38385 See merge request gitlab-org/gitlab-ce!15228
| * Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan2017-11-104-2/+17
| | | | | | | | | | | | | | Fix arguments error on Import/Export fetch_ref method Closes #39541 See merge request gitlab-org/gitlab-ce!15241
| * Merge branch '10-1-jivl-fix-cancel-button-file-upload-new-issue' into ↵Lin Jen-Shin2017-11-103-0/+81
| |\ | | | | | | | | | | | | | | | | | | 10-1-stable-patch-2 * 10-1-jivl-fix-cancel-button-file-upload-new-issue: Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'
| | * Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-063-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | Fix cancel button not working when uploading a file on the new issue page Closes #39512 See merge request gitlab-org/gitlab-ce!15137
| * | Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin2017-11-109-31/+63
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | * 10-1-stable: Update VERSION to 10.1.2 Update CHANGELOG.md for 10.1.2 Merge branch 'fix-mysql-grant-check' into 'master' Merge branch '36099-api-responses-missing-x-content-type-options-header' into '10-1-stable' Merge branch 'ssrf-protections-round-2' into 'security-10-1'
* | | Update VERSION to 10.1.2v10.1.2Lin Jen-Shin2017-11-081-1/+1
| | |
* | | Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-082-5/+4
| | | | | | | | | [ci skip]
* | | Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-073-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TRIGGER checks for MySQL Closes #38372 See merge request gitlab-org/gitlab-ce!15226 (cherry picked from commit d45fef88f7f0aa249893f9f151185eac5b9bb870)
View Lorry Controller Status