summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.3.8v10.3.8Robert Speicher2018-03-011-1/+1
|
* Update CHANGELOG.md for 10.3.8Robert Speicher2018-03-012-5/+7
| | | [ci skip]
* Merge branch '10-3-stable-patch-8' into '10-3-stable'Robert Speicher2018-03-014-1/+19
|\ | | | | | | | | Prepare 10.3.8 See merge request gitlab/gitlabhq!2340
| * Merge branch 'pages-6-1-gitlab-10-3' into 'security-10-3'Marin Jankovski2018-02-271-1/+1
| | | | | | | | | | Update gitlab-pages version (GitLab 10.3) See merge request gitlab/gitlabhq!2319
| * Merge branch 'sh-fix-otp-backup-invalidation-10-3' into 'security-10-3'Douwe Maan2018-02-273-0/+18
|/ | | | | Ensure that OTP backup codes are always invalidated (10.3 port) See merge request gitlab/gitlabhq!2328
* Update VERSION to 10.3.7v10.3.7Luke Bennett2018-02-051-1/+1
|
* Update CHANGELOG.md for 10.3.7Luke Bennett2018-02-055-20/+10
| | | [ci skip]
* Merge branch 'mc/bug/38984-wildcard-protected-tags-10-3' into 'security-10-3'Kamil Trzciński2018-02-027-9/+40
| | | | | Fix using wildcards in protected tags to expose protected variables - 10.3 See merge request gitlab/gitlabhq!2307
* Fix stored XSS in code blocksSean McGivern2018-02-013-15/+81
| | | | | | | | | | | | | | | There were three things here: 1. Display math was broken. 2. <script> tags could be injected into code blocks with the language as `math`, `mermaid`, or `plantuml`. 3. <script> tags could be injected if Rouge threw an exception, for whatever reason. This fixes all of those by always using the same code path for 'standard' highlighting and 'special' languages (mathematics, Mermaid, and PlantUML), and skipping the filter entirely if Rouge fails on a retry with the plain text filter. It also adds specs for KaTeX and Mermaid rendering.
* Merge branch 'fix-mermaid-xss-10-3' into 'security-10-3'Sean McGivern2018-02-017-0/+59
| | | | | [10.3] Fix stored XSS in code blocks See merge request gitlab/gitlabhq!2317
* Merge branch 'fix/gh-namespace-issue-10-3' into 'security-10-3'James Lopez2018-01-317-30/+88
| | | | | [10-3] Fix GitHub import allowing a user to create a group under any existing namespace See merge request gitlab/gitlabhq!2303
* Merge branch 'security-10-3-todo-api-reveals-sensitive-information' into ↵Robert Speicher2018-01-315-2/+19
| | | | | | | 'security-10-3' [10.3] Restrict Todo API mark_as_done endpoint to the user's todos only See merge request gitlab/gitlabhq!2314
* Merge branch ↵Douwe Maan2018-01-319-75/+410
| | | | | | | 'security-10-3-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-3' [Port for security-10-3]: Makes SnippetFinder ensure feature visibility See merge request gitlab/gitlabhq!2311
* Update VERSION to 10.3.6v10.3.6Oswaldo Ferreira2018-01-221-1/+1
|
* Update CHANGELOG.md for 10.3.6Oswaldo Ferreira2018-01-2218-86/+23
| | | [ci skip]
* Merge branch '10-3-stable-patch-6' into '10-3-stable'Oswaldo Ferreira2018-01-2279-243/+924
|\ | | | | | | | | Prepare 10.3.6 release See merge request gitlab-org/gitlab-ce!16581
| * Remove failing spec not needed for 10.310-3-stable-patch-6Jarka Kadlecová2018-01-221-12/+0
| |
| * Backport Gitlab::Git::Repository#create_hooks and fix conflictsStan Hu2018-01-194-5/+77
| |
| * Resolve incorrect conflict resolution for dispatcher cluster pagesEric Eastwood2018-01-191-3/+6
| |
| * Change FactoryBot to FactoryGirlTiago Botelho2018-01-191-1/+1
| |
| * Merge branch 'fix-docs-help-shortcut' into 'master'Phil Hughes2018-01-196-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix shortcut links on help page Closes #41097 See merge request gitlab-org/gitlab-ce!16001 (cherry picked from commit 4e60b4f1cdfa7dc3524d17bf313d348758950ecf) befa1e5b Fix shortcut links on help page 4860f586 Add changelog e4786a85 Add bundle and spec
| * Merge branch ↵Marcia Ramos2018-01-191-0/+50
| | | | | | | | | | | | | | | | | | | | | | '41342-add-ci-yml-example-for-browser-performance-testing-in-ce' into 'master' Add CI YML example for Browser Performance Testing in CE See merge request gitlab-org/gitlab-ce!16058 (cherry picked from commit 3ee5fd156e3465a1e1c04b2b321c62b577496ee8) 496f2ba7 Add CI YML example for CE
| * Merge branch 'docs-move-transfer-project-to-group' into 'master'Achilleas Pipinellis2018-01-195-63/+174
| | | | | | | | | | | | Refactor user, project and group docs when changing namespace See merge request gitlab-org/gitlab-ce!16019
| * Merge branch 'docs-clarify-auto-devops-pipelines' into 'master'Achilleas Pipinellis2018-01-192-15/+8
| | | | | | | | | | | | | | | | | | | | Clarify Auto DevOps pipelines See merge request gitlab-org/gitlab-ce!16106 (cherry picked from commit 2972352a9c6912adfd77b480472eb13b832a6c3b) 16f45850 Clarify Auto DevOps pipelines e263f7e5 Remove image to Auto DevOps settings and refactor the enable section
| * Merge branch 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2018-01-193-1/+11
| | | | | | | | | | | | | | | | | | | | | | Gracefully handle garbled URIs in Markdown Closes #41442 See merge request gitlab-org/gitlab-ce!16123 (cherry picked from commit 29749f92b7f86d45af41509262601e47ee848d92) 0faf772b Gracefully handle garbled URIs in Markdown
| * Merge branch 'fix-abuse-reports-link-url' into 'master'Robert Speicher2018-01-192-1/+6
| | | | | | | | | | | | | | | | | | | | Fixed abuse reports link url See merge request gitlab-org/gitlab-ce!16068 (cherry picked from commit 97bebab61f1589a9c434ccb8169a635d72a3bdf2) 7dfafd0f Fixed abuse reports link url 9574818e Add changelog entry
| * Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' ↵Douwe Maan2018-01-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | into 'master' Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs. See merge request gitlab-org/gitlab-ce!16175 (cherry picked from commit b6d3dfe5b935872fc8715475e56a528de0589d51) 387c808f Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs.
| * Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-193-10/+25
| | | | | | | | | | | | | | | | | | Avoid leaving a push event empty if payload cannot be created See merge request gitlab-org/gitlab-ce!16214 (cherry picked from commit 51562aafc782f7eb65152f0551d9cb41268aeae2) 57dc5a52 Avoid leaving a push event empty if payload cannot be created
| * Merge branch '41396-ee_compat_check-and-security-fix-development' into 'master'Rémy Coutable2018-01-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | Do not run ee_compat_check on security branches Closes #41396 See merge request gitlab-org/gitlab-ce!16188 (cherry picked from commit 54bbcc3df962b46d565bc0274e2932c7a718fdc6) ebdcbd45 Do not run ee_compat_check on security branches
| * Merge branch ↵Stan Hu2018-01-193-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handler' into 'master' Resolve "Branch name omitted due to bad UTF-8 conversion by Gitaly ref handler" Closes #41677 See merge request gitlab-org/gitlab-ce!16243 (cherry picked from commit f7afb14c1150d686e53cb71da182ef014eba2a61) 5152cc3b Fix a bug where charlock_holmes was used needlessly to encode strings
| * Merge branch ↵Douwe Maan2018-01-193-8/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master' Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass" Closes #41468 See merge request gitlab-org/gitlab-ce!16193 (cherry picked from commit 016a2b6e7ec10c668f09713ae63408ed73dd8feb) 528b5eeb Fix error when viewing diffs without blobs
| * Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-194-1/+23
| | | | | | | | | | | | | | | | Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
| * Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-196-7/+28
| | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| * Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'Douwe Maan2018-01-194-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug related to wiki last version Closes #41477 and #41506 See merge request gitlab-org/gitlab-ce!16197 (cherry picked from commit 65b04860c24949f8c327db0be9fc967dfe8225b5) e44ca26f Fixing bug related to wiki last version abe399b1 Added changelog e471ec00 Restoring last version and created monkey patch 52c9dcb4 Fixed spec descriptions 5814d83c Updated monkey patch to work with paths with more than one dir b9ff53c0 Updated specs bc261232 Fixing offense
| * Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-195-88/+17
| | | | | | | | | | | | | | | | | | Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration See merge request gitlab-org/gitlab-ce!16205 (cherry picked from commit d2891822e708f91c92b3a45bbbb78831b424e59a) f6352772 Make DeleteConflictingRedirectRoutes no-op
| * Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'Fatih Acet2018-01-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox Closes #41563 See merge request gitlab-org/gitlab-ce!16244 (cherry picked from commit ae46ceaab097923b46099a87d8ca63443aa85248) f4c2eeb2 Fix custom name in branch creation for issue in Firefox 578c930f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into…
| * Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-195-3/+47
| | | | | | | | | | | | | | | | Fix hooks not being set up properly for bare import Rake task Closes #41739 See merge request gitlab-org/gitlab-ce!16280
| * Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-195-5/+33
| | | | | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
| * Merge branch 'fj-41598-fixing-request-mime-type' into 'master'Douwe Maan2018-01-193-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixing request json mime type Closes #41598 See merge request gitlab-org/gitlab-ce!16427 (cherry picked from commit f402762d2c315f462fb3c805990b9842953bc8dc) defd12cc Trying to fix the json mime type in the request 2c352404 Added changelog b7c19497 Added regression test
| * Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-194-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397 (cherry picked from commit d607f16fe5a1ec51eaea5811b5118b1ba48acfbc) 1dc30595 Revert "Revert "Fix Route validation for unchanged path"" c517788e Fix Rubocop offense 601c24d5 Add RedirectRoute factory d4c8d1b7 Add changelog entry
| * Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-193-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Set target_branch to the ref branch when creating MR from issue Closes #41727 See merge request gitlab-org/gitlab-ce!16422 (cherry picked from commit b4bc9bd5c5bedcd57e795f91f0668d7f2c622cde) 7e9484e9 Set target_branch to the ref branch when creating MR from issue
| * Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-193-2/+16
| | | | | | | | | | | | | | | | | | | | | | Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440 (cherry picked from commit 3228ac06a019c9126b965ff32e354d10011a4f76) c4dd7b82 Prevent RevList failing on non utf8 paths
| * Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵Grzegorz Bizon2018-01-193-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356 (cherry picked from commit e726644123c70eb8f62a6b6b433c2e4fea8e8a52) 44c8f919 Fix incorrect default merge request title when external issue tracker is activated ca275561 Never set special MR titles for external issues f9cf2f99 Give appropriate credit to Ben305 in the changelog
| * Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵Filipa Lacerda2018-01-192-6/+10
| | | | | | | | | | | | | | | | | | | | into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
| * Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-192-1/+10
|/ | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537 (cherry picked from commit 50a649530a53a04d2044f9e4c5502586a7ed0c59) b1261ad9 Fix Mermaid drawings not loading on some browsers
* Update VERSION to 10.3.5v10.3.5Oswaldo Ferreira2018-01-181-1/+1
|
* Update CHANGELOG.md for 10.3.5Oswaldo Ferreira2018-01-181-0/+4
| | | [ci skip]
* Merge branch 'fj-42112-fix-deploy-keys-migration-mysql-10-3' into '10-3-stable'10-3-stable-patch-5Stan Hu2018-01-173-28/+111
|\ | | | | | | | | [10.3] Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16530
| * [10.3] Fix bug in security release with deploy keys migrationFrancisco Javier López2018-01-173-28/+111
|/
* Update VERSION to 10.3.4v10.3.4Oswaldo Ferreira2018-01-101-1/+1
|
View Lorry Controller Status