summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* | | Merge branch '36099-api-responses-missing-x-content-type-options-header' ↵Douwe Maan2017-11-073-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into '10-1-stable' Include X-Content-Type-Options (XCTO) header into API responses See merge request gitlab/gitlabhq!2211 (cherry picked from commit 6c818e77f2abeef2dd7b17a269611b018701fa79) e087e075 Include X-Content-Type-Options (XCTO) header into API responses
* | | Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-072-1/+19
| |/ |/| | | | | | | | | | | | | | | Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions See merge request gitlab/gitlabhq!2219 (cherry picked from commit 4a1e73783d5480aa514db7b53e10c075f95580b5) 1bffa0c3 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions
| * Merge branch 'docs/ci-disposable-env-fix' into 'master'Marcia Ramos2017-11-061-2/+2
| | | | | | | | | | Fix wording on CI disposable variables See merge request gitlab-org/gitlab-ce!14983
| * Merge branch '39704-fix-webhooks_log_time' into 'master'Stan Hu2017-11-065-3/+8
| | | | | | | | | | | | | | Fix webhook recent deliveries elapsed time field Closes #39704 See merge request gitlab-org/gitlab-ce!15146
| * Merge branch 'clarify-docs-about-external-artifacts-and-gitlab-pages' into ↵Grzegorz Bizon2017-11-061-2/+4
| | | | | | | | | | | | | | 'master' Document GitLab pages prerequisite with external HTML artifacts See merge request gitlab-org/gitlab-ce!15153
| * Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu2017-11-063-13/+6
| | | | | | | | | | Remove Filesystem check metrics that use too much CPU to handle requests See merge request gitlab-org/gitlab-ce!15158
| * Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-0614-18/+182
| | | | | | | | | | | | | | This fixes some bugs related to forked projects of which the source was deleted. Closes #39667 See merge request gitlab-org/gitlab-ce!15150
| * Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-063-1/+20
| | | | | | | | | | | | | | Render 404 when polling commit notes without having permissions Closes #39176 See merge request gitlab-org/gitlab-ce!15140
| * Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon2017-11-063-1/+25
| | | | | | | | | | | | | | Avoid regenerating the ref path for the environment Closes #39752 See merge request gitlab-org/gitlab-ce!15167
| * Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-062-1/+10
| | | | | | | | | | | | | | Fix a migration that adds merge_requests_ff_only_enabled column to MR table Closes #39382 and #39357 See merge request gitlab-org/gitlab-ce!15195
| * Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-11-063-1/+25
| | | | | | | | | | | | | | Fix diff parser so it tolerates to diff special markers in the content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
| * Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-11-062-14/+16
| | | | | | | | | | Fix the incorrect value being used to set GL_USERNAME on hooks See merge request gitlab-org/gitlab-ce!15038
| * Merge branch ↵Tim Zallmann2017-11-068-51/+55
| | | | | | | | | | | | | | | | | | '35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-state' into 'master' Resolve "Searchable settings puts expand/collapse toggle in an invalid state." Closes #35955, #37520, and #39207 See merge request gitlab-org/gitlab-ce!13363
| * Merge branch '39726-add-crsf-token-axios' into 'master'Phil Hughes2017-11-062-0/+8
|/ | | | | | | Add crsf token in axios calls Closes #39726 See merge request gitlab-org/gitlab-ce!15155
* Update VERSION to 10.1.1v10.1.1Winnie Hellmann2017-10-311-1/+1
|
* Update CHANGELOG.md for 10.1.1Winnie Hellmann2017-10-3122-107/+24
| | | [ci skip]
* Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-11-019-12/+35
| | | | | | | Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103
* Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-11-017-1/+27
| | | | | | | Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109
* Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-311-1/+4
| | | | | | | Trigger change event of the markdown textarea to allow Vue catch the programmatic changes. Closes #38441 See merge request gitlab-org/gitlab-ce!14539
* Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-314-16/+20
| | | | | | | Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861
* Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-312-8/+19
| | | | | | | Adds callback function to initial cluster request Closes #39639 See merge request gitlab-org/gitlab-ce!15105
* Merge branch ↵Stan Hu2017-10-302-3/+3
| | | | | | | 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master' Update Prometheus Gem to fix problem caused by using wrong data offsets See merge request gitlab-org/gitlab-ce!15081
* Merge branch '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis2017-10-301-33/+90
| | | | | Add docs for backing up to Google Cloud Storage See merge request gitlab-org/gitlab-ce!15074
* Merge branch ↵Yorick Peterse2017-10-302-1/+6
| | | | | | | | | '39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #39054 See merge request gitlab-org/gitlab-ce!15063
* Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-307-59/+31
| | | | | | Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
* Merge branch 'bvl-circuitbreaker-patch' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-3027-306/+470
|\ | | | | | | | | Circuitbreaker stable patch See merge request gitlab-org/gitlab-ce!15079
| * Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-3019-196/+275
| | | | | | | | | | | | | | | | Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
| * Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-3021-127/+212
|/ | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
* Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12
| | | | | | | Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
View Lorry Controller Status