summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG.md for 10.4.6Mark Fletcher2018-03-162-10/+0
| | | [ci skip]
* Merge branch 'fix/auth0-unsafe-login-10-4' into 'security-10-4'James Lopez2018-03-161-0/+5
| | | | | [10.4] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2352
* Merge branch 'fj-15329-services-callbacks-ssrf-10-4' into 'security-10-4'Douwe Maan2018-03-161-0/+5
| | | | | | [10.4] Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2347
* Update CHANGELOG.md for 10.4.5Robert Speicher2018-03-011-5/+0
| | | [ci skip]
* Merge branch 'sh-fix-otp-backup-invalidation-10-4' into 'security-10-4'Douwe Maan2018-02-271-0/+5
| | | | | Ensure that OTP backup codes are always invalidated (10.4 port) See merge request gitlab/gitlabhq!2327
* Update CHANGELOG.md for 10.4.4Ian Baum2018-02-1610-51/+0
| | | [ci skip]
* Merge branch 'fj-37528-error-after-disabling-ldap' into 'master'Douwe Maan2018-02-151-0/+6
| | | | | | | Fixed user synced attributes metadata after removing current provider Closes #37528 See merge request gitlab-org/gitlab-ce!17054
* Add changelog entryMichael Kozono2018-02-141-0/+5
|
* Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-141-0/+5
| | | | | | | | Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902
* Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ↵Douwe Maan2018-02-141-0/+5
| | | | | | | | | 'master' Avoid error when creating forks and restricted levels are defined Closes #42607 See merge request gitlab-org/gitlab-ce!16881
* Merge branch '42696-gitlab-import-leaves-group_id-on-projectlabel' into 'master'Stan Hu2018-02-141-0/+5
| | | | | | | | Resolve "GitLab import leaves `group_id` on ProjectLabel" Closes #42696 See merge request gitlab-org/gitlab-ce!16877
* Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-141-0/+5
| | | | | | | Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
* Merge branch ↵Douwe Maan2018-02-141-0/+5
| | | | | | | | | '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
* Merge branch 'sh-fix-jira-trailing-slash' into 'master'Robert Speicher2018-02-141-0/+5
| | | | | | | Fix JIRA not working when a trailing slash is included Closes #42494 See merge request gitlab-org/gitlab-ce!16748
* Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-141-0/+5
| | | | | | | Remove problematic LDAP::Person validation for new strategy Closes #42412 and #42359 See merge request gitlab-org/gitlab-ce!16727
* Merge branch '42591-update-nokogiri' into 'master'Stan Hu2018-02-071-0/+5
| | | | | | | Resolve "Update Nokogiri to 1.8.2" Closes #42591 See merge request gitlab-org/gitlab-ce!16807
* Update CHANGELOG.md for 10.4.3Luke Bennett2018-02-054-20/+0
| | | [ci skip]
* Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-021-0/+5
| | | | | Fix using wildcards in protected tags to expose protected variables See merge request gitlab/gitlabhq!2306
* Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-01-311-0/+5
| | | | | [10.4] Fix stored XSS in code blocks See merge request gitlab/gitlabhq!2316
* Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-01-311-0/+5
| | | | | [10.4] Fix GH namespace security issue See merge request gitlab/gitlabhq!2295
* Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into ↵Robert Speicher2018-01-311-0/+5
| | | | | | | 'security-10-4' Restrict Todo API mark_as_done endpoint to the user's todos only See merge request gitlab/gitlabhq!2313
* Update CHANGELOG.md for 10.4.2Mark Fletcher2018-01-307-36/+0
| | | [ci skip]
* Merge branch 'vendor-auto-devops-template-in-10-4' into '10-4-stable'Robert Speicher2018-01-301-0/+5
|\ | | | | | | | | | | | | Update Auto-DevOps.gitlab-ci.yml [ci skip] See merge request gitlab-org/gitlab-ce!16691
| * Fix invalid changelog YAMLRobert Speicher2018-01-291-0/+0
| | | | | | | | [ci skip]
| * Add changelogvendor-auto-devops-template-in-10-4Fabio Busatto2018-01-291-0/+5
| |
* | Merge branch ↵10-4-stable-patch-2Fatih Acet2018-01-291-0/+5
| | | | | | | | | | | | | | | | '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master' Fix visibility of "Allow users to request access" option in public projects See merge request gitlab-org/gitlab-ce!16485
* | Merge branch ↵Douwe Maan2018-01-291-0/+6
| | | | | | | | | | | | | | | | | | '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master' Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)." Closes #42327 See merge request gitlab-org/gitlab-ce!16714
* | Merge branch ↵Rémy Coutable2018-01-291-0/+5
| | | | | | | | | | | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
* | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-291-0/+5
| | | | | | | | | | | | | | Use has_table_privilege for TRIGGER on PostgreSQL Closes #38634 See merge request gitlab-org/gitlab-ce!16618
* | Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-291-0/+5
| | | | | | | | | | | | | | Resolve "Cannot copy/paste on iOS" Closes #32546 See merge request gitlab-org/gitlab-ce!15804
* | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-0/+5
| | | | | | | | | | | | | | Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
* | Update CHANGELOG.md for 10.4.1Robert Speicher2018-01-246-32/+0
|/ | | [ci skip]
* Merge branch ↵Robert Speicher2018-01-231-0/+6
| | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595 (cherry picked from commit 4bf2fded92e05420e6d103c8df63d6d83198a684) 94f31ccc fix issue in which projects which have forks cannot be changed from private to public 1eefc384 add CHANGELOG.md entry for !16595 003f140c ensure fork_source returns nil when project is the root fork, add tests 96862096 add test to can_change_visibility_level? method de4993d4 remove redundant forked? check 2c1d7c09 fix spacing and wrap method params in parens
* Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-221-0/+5
| | | | | | | Fix filtering projects & groups on group pages Closes #40785 See merge request gitlab-org/gitlab-ce!16584
* Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-221-0/+5
| | | | | | | Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
* Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-221-0/+5
| | | | | | | Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
* Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'Stan Hu2018-01-221-0/+6
| | | | | | | Delete conflicting orphaned routes before validation Closes #39551 See merge request gitlab-org/gitlab-ce!16242
* Merge branch 'fix-redirect-routes-schema' into 'master'Yorick Peterse2018-01-221-0/+5
| | | | | | rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
* Update CHANGELOG.md for 10.4.0Luke Bennett2018-01-22144-731/+0
| | | [ci skip]
* Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-181-0/+5
| | | | | | | | | | | 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
* Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-181-0/+5
| | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789 (cherry picked from commit 7acabf7c5908940665e1a8c4e3d09d423385657a) d0b8f536 Remove soft removals related code e5c49b57 Added tests for removing soft removed objects
* Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵Filipa Lacerda2018-01-171-0/+5
| | | | | | | | | | 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 '10-4-stable-prepare-rc7' of ↵Luke Bennett2018-01-171-0/+5
|\ | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
| * Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki uploaded files are missing" Closes #42031 See merge request gitlab-org/gitlab-ce!16499 (cherry picked from commit 79b05cdd469726582e916cb606ba14b440a59011) 31e59219 Fix links to uploaded files on wiki pages
* | Merge branch '10-4-stable-prepare-rc7' of ↵Luke Bennett2018-01-171-0/+5
|\ \ | |/ | | | | https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
| * Merge branch '42046-fork-icon' into 'master'Fatih Acet2018-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474 (cherry picked from commit 78ca7d97bbb12be11bd2ebeb8b03ae2277c5ec10) d76047a1 fix fork icon size and button icon color on Forks page 3ec647ed Update 42046-fork-icon.yml
* | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-171-0/+5
|/ | | | | | Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
* Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-171-0/+5
| | | | | | | | | | | 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 '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+5
| | | | | | | | | | | 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 '41874-closed-todo' into 'master'Douwe Maan2018-01-171-0/+5
| | | | | | | | Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414