summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.8.5v11.8.5GitLab Release Tools Bot2019-03-271-1/+1
|
* Update CHANGELOG.md for 11.8.5GitLab Release Tools Bot2019-03-278-35/+13
| | | [ci skip]
* Revert "Update CHANGELOG.md for 11.8.4"Robert Speicher2019-03-278-10/+36
| | | | This reverts commit a8ff8ca405e16fb11c6334097cbb44fa64235311.
* Merge branch '11-8-stable' of dev.gitlab.org:gitlab/gitlabhq into 11-8-stableRobert Speicher2019-03-2754-32322/+51778
|\
| * Update VERSION to 11.8.4v11.8.4GitLab Release Tools Bot2019-03-261-1/+1
| |
| * Update CHANGELOG.md for 11.8.4GitLab Release Tools Bot2019-03-268-35/+13
| | | | | | [ci skip]
| * Merge branch 'security-55503-fix-pdf-js-11-8' into '11-8-stable'Yorick Peterse2019-03-268-32169/+50870
| |\ | | | | | | | | | | | | Fix PDF.js vulnerability See merge request gitlab/gitlabhq!3025
| | * 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-8' into ↵GitLab Release Tools Bot2019-03-263-5/+30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | '11-8-stable' Disallow changing namespace of a project in update method See merge request gitlab/gitlabhq!3032
| | * | Refactor specs according to the code reviewMałgorzata Ksionek2019-03-261-1/+1
| | | |
| | * | Add cr remarksMałgorzata Ksionek2019-03-253-5/+5
| | | |
| | * | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-213-5/+30
| | | |
| * | | Merge branch 'security-exif-migration-11-8' into '11-8-stable'GitLab Release Tools Bot2019-03-267-1/+364
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Rake task for removing exif from uploads See merge request gitlab/gitlabhq!3011
| | * | | Rake task for removing exif from uploadsJan Provaznik2019-03-257-1/+364
| | | | | | | | | | | | | | | | | | | | | | | | | Adds a rake task which can be used for removing EXIF data from existing uploads.
| * | | | Merge branch 'security-use-untrusted-regexp-11-8' into '11-8-stable'GitLab Release Tools Bot2019-03-2615-96/+198
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use UntrustedRegexp for CI refs matching See merge request gitlab/gitlabhq!3007
| | * | | | Make CI refs matching to to use UntrustedRegexpKamil Trzciński2019-03-1515-96/+198
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | This makes ref validation to use always `UntrustedRegexp`. This also splits the existing RubySyntax into separate class.
| * | | | Merge branch 'security-milestone-labels-11-8' into '11-8-stable'GitLab Release Tools Bot2019-03-265-8/+167
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Check label_ids parent when updating issue board See merge request gitlab/gitlabhq!3036
| | * | | | Check if labels are available for target issuableJarka Košanová2019-03-255-8/+167
| | | |/ / | | |/| | | | | | | | | | | | | | | | | - labels have to be in the same project/group as an issuable
| * | | | Merge branch 'security-2819-xss-resolve-conflicts-branch-name-11-8' into ↵GitLab Release Tools Bot2019-03-263-1/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11-8-stable' Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2987
| | * | | | Fix XSS in resolve conflicts formPaul Slaughter2019-03-143-1/+21
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
| * | | | Merge branch 'security-56224-11-8' into '11-8-stable'GitLab Release Tools Bot2019-03-265-4/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix related branches visible in issues for guests See merge request gitlab/gitlabhq!3019
| | * | | | Hide related branches when user does not have permissionMark Chao2019-03-205-4/+47
| | | |_|/ | | |/| | | | | | | | | | | | Guest user of a project should not see branches
| * | | | Merge branch 'security-disallow-guests-to-access-releases-11-8' into ↵GitLab Release Tools Bot2019-03-264-3/+46
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | '11-8-stable' Disallow guest users from accessing Releases See merge request gitlab/gitlabhq!3043
| | * | | Disallow guest users from accessing ReleasesShinya Maeda2019-03-264-3/+46
| |/ / / | | | | | | | | | | | | As they do not have a permission to read git tag
| * | | Merge remote-tracking branch 'dev/11-8-stable' into 11-8-stableAlex Hanselka2019-03-204-2/+40
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * dev/11-8-stable: Update VERSION to 11.8.3 Update CHANGELOG.md for 11.8.3 Only return `commands_changes` used in frontend
| | * | Update VERSION to 11.8.3v11.8.3GitLab Release Tools Bot2019-03-191-1/+1
| | | |
| | * | Update CHANGELOG.md for 11.8.3GitLab Release Tools Bot2019-03-192-5/+7
| | | | | | | | | | | | [ci skip]
| | * | Merge branch 'security-11-8-2826-fix-project-serialization-in-quick-actions' ↵Yorick Peterse2019-03-193-1/+37
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into '11-8-stable' Fix project serialization in quick actions response See merge request gitlab/gitlabhq!3016
| | | * Only return `commands_changes` used in frontendHeinrich Lee Yu2019-03-183-1/+37
| | |/ | | | | | | | | | | | | When executing quick actions, this limits the `commands_changes` response to only those used by the frontend
| * | Merge branch 'update-upgrading-from-source-document-11-8' into '11-8-stable'Achilleas Pipinellis2019-03-181-2/+2
| |\ \ | | |/ | |/| | | | | | | Update documentation to note Ruby 2.5 requirement See merge request gitlab-org/gitlab-ce!26187
| | * Update documentation to note Ruby 2.5 requirementJason Plum2019-03-141-2/+2
| |/ | | | | | | Update the documented version requirement of Ruby inside of Upgrading from Source to show GitLab 11.6+ needs Ruby 2.5
| * Update VERSION to 11.8.2v11.8.2GitLab Release Tools Bot2019-03-131-1/+1
| |
| * Update CHANGELOG.md for 11.8.2GitLab Release Tools Bot2019-03-137-31/+15
|/ | | [ci skip]
* Merge branch 'modify_group_policy' into 'master'Rémy Coutable2019-03-133-5/+12
| | | | | Update group policy to reflect all the requirements See merge request gitlab-org/gitlab-ce!25854
* Merge dev 11-8-stable into .com 11-8-stableYorick Peterse2019-03-120-0/+0
|\
| * Merge branch 'security-shared-project-private-group-11-8' into '11-8-stable'Yorick Peterse2019-03-044-11/+67
| |\ | | | | | | | | | | | | Sharing a public project with a private group makes the group page publicly accessible See merge request gitlab/gitlabhq!2986
| | * Secure vulerability and add specsMałgorzata Ksionek2019-02-284-11/+67
| |/
* | Secure vulerability and add specsMałgorzata Ksionek2019-03-124-7/+67
| |
* | Merge branch '11-8-stable-patch-2' into '11-8-stable'Yorick Peterse2019-03-1223-30/+147
|\ \ | |/ |/| | | | | Prepare 11.8.2 release See merge request gitlab-org/gitlab-ce!25963
| * Merge branch 'rs-fix-time-based-broken-master' into 'master'Fatih Acet2019-03-121-0/+6
| | | | | | | | | | | | | | | | | | Freeze date in merge request status view spec See merge request gitlab-org/gitlab-ce!25671 (cherry picked from commit c994484d17d6a6da929f6a52f1b64dc15c38835c) a05aba61 Freeze date in merge request status view spec
| * Merge branch 'qa-quarantine-failing-push-mirror-repo-spec' into 'master'Ramya Authappan2019-03-111-1/+2
| | | | | | | | | | | | | | | | | | Quarantine failing push_mirroring_over_http_spec See merge request gitlab-org/gitlab-ce!25590 (cherry picked from commit 68b1ed92c18d5f975dd65c09d72ca3441eb0bc56) 141c5e4e Quarantine failing spec
| * Merge branch 'jc-fix-set-project-writable' into 'master'Douglas Barbosa Alexandre2019-03-113-1/+16
| | | | | | | | | | | | | | | | | | Fix method to mark a project repository as writable See merge request gitlab-org/gitlab-ce!25546 (cherry picked from commit a8a02387a7ea5c5a4a6f733a043adf2b1f907e3c) df044542 Fix project set_repository_writable!
| * Merge branch '58149-fix-read-list-board-policy' into 'master'Nick Thomas2019-03-113-2/+9
| | | | | | | | | | | | | | | | | | | | | | Allow `:read_list` when `:read_group` is allowed Closes #58149 See merge request gitlab-org/gitlab-ce!25524 (cherry picked from commit 61c1509cc992959ac5021d10825d5dbf9dd2c091) b81e7c52 Enable `:read_list` when `:read_group` is enabled
| * Merge branch 'sh-fix-issue-58103' into 'master'Grzegorz Bizon2019-03-113-1/+15
| | | | | | | | | | | | | | | | | | | | | | Properly handle multiple X-Forwarded-For addresses in runner IP Closes #58103 See merge request gitlab-org/gitlab-ce!25511 (cherry picked from commit dbf0a92292dd054843d28ec27d52222418400ca5) d03b7bb1 Properly handle multiple X-Forwarded-For addresses in runner IP
| * Merge branch 'jl-update-ruby-2-5-docs' into 'master'Evan Read2019-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | Update minimum ruby version to 2.5. See merge request gitlab-org/gitlab-ce!25496 (cherry picked from commit 74cf92aae719969fc5225b41f923c2e7f3e04c5b) ac34b4ac Update minimum ruby version to 2.5. a538b6db Update example versions
| * Merge branch 'ps-remove-mr-widget-section-padding' into 'master'Annabel Dunstone Gray2019-03-112-2/+1
| | | | | | | | | | | | | | | | | | Remove padding for mr-widget-section See merge request gitlab-org/gitlab-ce!25475 (cherry picked from commit a6d52ff83ff86f88f59f6a231fc4a348640729f7) 7bd65593 Remove padding for mr-widget-section
| * Merge branch 'docs-review-mr-diffs-admin' into 'master'Sean McGivern2019-03-112-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | Docs review: MR diffs external storage Closes #57335 See merge request gitlab-org/gitlab-ce!25433 (cherry picked from commit 56b82db63a91695a1dec1b7cbf39636bb01ad3df) 1387983b Docs review: wording, styles, missing links 01680510 Copy edit - add missing preposition
| * Merge branch 'qa-team-tasks-92-test-failure-retries' into 'master'Mark Lapierre2019-03-114-0/+67
| | | | | | | | | | | | | | | | | | | | | | Retry failing tests Closes gitlab-org/quality/team-tasks#92 See merge request gitlab-org/gitlab-ce!25391 (cherry picked from commit b570f53d17f5bc0e72fef9a122b7fe5645db0ea9) d54cb37d Retry failed tests with rspec-retry
| * Merge branch ↵Stan Hu2019-03-113-1/+16
|/ | | | | | | | | | | | | '57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid' into 'master' Resolve "Gitlab Project import fails: sidekiq undefined method import_jid" Closes #57579 See merge request gitlab-org/gitlab-ce!25239 (cherry picked from commit c06ebe511700f25a61b4dfaa518fbed7667c6876) 401a3bca Fix import_jid error on project import
* Update VERSION to 11.8.1v11.8.1GitLab Release Tools Bot2019-02-281-1/+1
|