summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.5.8v10.5.810-5-stableMayra Cabrera2018-04-241-1/+1
|
* Update CHANGELOG.md for 10.5.8Mayra Cabrera2018-04-242-5/+7
| | | [ci skip]
* Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-242-4/+1
| | | | | | | Fix the reCAPTCHA spec failures by not rendering the widget in test mode Closes #45138 See merge request gitlab-org/gitlab-ce!18235
* Merge branch '10-5-security_issue_42029' into 'security-10-5'Phil Hughes2018-04-244-2/+18
| | | | | Sanitize user name to avoid XSS attacks See merge request gitlab/gitlabhq!2374
* Merge branch 'sh-downgrade-mysql-ci' into 'master'Robert Speicher2018-04-201-1/+1
| | | | | | | Downgrade MySQL CI service from 8.0 to 5.7 Closes #45606 See merge request gitlab-org/gitlab-ce!18512
* Update VERSION to 10.5.7v10.5.7Filipa Lacerda2018-04-031-1/+1
|
* Update CHANGELOG.md for 10.5.7Filipa Lacerda2018-04-033-10/+8
| | | [ci skip]
* Merge branch 'jej/mattermost-notification-confidentiality-10-5' into ↵Douwe Maan2018-04-0335-22/+504
| | | | | | | 'security-10-5' [10.5] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2339
* Merge branch '42028-xss-diffs' into 'security-10-5'Douwe Maan2018-04-033-4/+38
| | | | | Fix XSS on commit diff view See merge request gitlab/gitlabhq!2323
* Merge branch 'fl-fix-milestone-bug' into 'security-10-5'Phil Hughes2018-04-032-4/+22
| | | | | Fix milestone bug See merge request gitlab/gitlabhq!2344
* Update VERSION to 10.5.6v10.5.6Mark Fletcher2018-03-161-1/+1
|
* Update CHANGELOG.md for 10.5.6Mark Fletcher2018-03-163-10/+8
| | | [ci skip]
* Merge branch '10-5-stable-patch-6' into '10-5-stable'Mark Fletcher2018-03-1647-129/+542
|\ | | | | | | | | Prepare 10.5.6 See merge request gitlab/gitlabhq!2357
| * Merge branch 'fix/auth0-unsafe-login-10-5' into 'security-10-5'James Lopez2018-03-168-50/+134
| | | | | | | | | | [10.5] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2353
| * Merge branch 'fj-15329-services-callbacks-ssrf-10-5' into 'security-10-5'Douwe Maan2018-03-1639-79/+408
|/ | | | | | [10.5] Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2348
* Update VERSION to 10.5.5v10.5.5Ian Baum2018-03-151-1/+1
|
* Update CHANGELOG.md for 10.5.5Ian Baum2018-03-156-25/+14
| | | [ci skip]
* Merge branch '10-5-stable-patch-5' into '10-5-stable'Ian Baum2018-03-1518-100/+306
|\ | | | | | | | | Prepare 10.5.5 release See merge request gitlab-org/gitlab-ce!17779
| * Merge branch 'sh-remove-double-caching-repo-empty' into 'master'10-5-stable-patch-5Sean McGivern2018-03-153-5/+10
| | | | | | | | | | | | | | Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
| * Resolve conflicts in namespace_spec.rbMichael Kozono2018-03-151-107/+40
| | | | | | | | I copied the whole `#move_dir` spec from master and flipped project factory traits `:hashed` and `:legacy_storage` to match the 10.5 branch (since in that branch, legacy storage is default, but in master, hashed is default).
| * Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-155-30/+214
| | | | | | | | | | | | | | | | Fix moving local, unhashed upload or pages directories during group transfer Closes #43993 See merge request gitlab-org/gitlab-ce!17658
| * Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-153-4/+21
| | | | | | | | | | Fix code and wiki search results when filename is non-ASCII See merge request gitlab-org/gitlab-ce!17685
| * Merge branch 'sh-add-missing-acts-as-taggable-indices' into 'master'Yorick Peterse2018-03-153-0/+28
| | | | | | | | | | | | | | Adding missing indexes migrations from taggings table Closes #43927 See merge request gitlab-org/gitlab-ce!17563
| * Merge branch 'sh-add-section-name-index' into 'master'Yorick Peterse2018-03-153-1/+29
| | | | | | | | | | | | | | | | Add index on section_name_id on ci_build_trace_sections table Closes #44008 See merge request gitlab-org/gitlab-ce!17632
| * Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-152-10/+21
|/ | | | | | | Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
* Update VERSION to 10.5.4v10.5.4Ian Baum2018-03-081-1/+1
|
* Update CHANGELOG.md for 10.5.4Ian Baum2018-03-0813-61/+21
| | | [ci skip]
* Merge branch '10-5-stable-patch-4' into '10-5-stable'Ian Baum2018-03-0855-397/+845
|\ | | | | | | | | Prepare 10.5.4 release See merge request gitlab-org/gitlab-ce!17584
| * Fix rubocop error with features/steps/project/pages.rb10-5-stable-patch-4Ian Baum2018-03-071-1/+1
| |
| * Fix pages spinach failureKamil Trzciński2018-03-071-1/+1
| |
| * Merge branch '42877-for-10-5-stable-patch-4' into '10-5-stable-patch-4'Ian Baum2018-03-071-3/+0
| |\ | | | | | | | | | | | | Fix snippets problem in 10-5-stable-patch-4 See merge request gitlab-org/gitlab-ce!17610
| | * Fix snippets problem in 10-5-stable-patch-4Andreas Brandl2018-03-071-3/+0
| |/
| * Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński2018-03-074-14/+44
| | | | | | | | | | | | | | | | Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
| * Revert "Merge branch 'fix/sm/fix_pages_worker' into 'master'"Ian Baum2018-03-075-94/+14
| | | | | | | | This reverts commit 6846dad292bd7693859012a5b27158d1a995ddae.
| * Merge branch 'backport-ee-5049-to-ce' into 'master'Douwe Maan2018-03-071-2/+15
| | | | | | | | | | Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CE See merge request gitlab-org/gitlab-ce!17520
| * Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński2018-03-065-14/+94
| | | | | | | | | | | | | | | | Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
| * Merge branch '42877-fix-visibility-change-performance' into 'master'Yorick Peterse2018-03-065-40/+77
| | | | | | | | | | | | | | | | Revert Project.public_or_visible_to_user changes but apply change to SnippetsFinder Closes #42877 See merge request gitlab-org/gitlab-ce!17476
| * Merge branch 'remove-projects-finder-from-todos-finder' into 'master'Sean McGivern2018-03-062-9/+11
| | | | | | | | | | | | | | Don't use ProjectsFinder in TodosFinder Closes #43767 See merge request gitlab-org/gitlab-ce!17462
| * Merge branch 'an/lograge-fix' into 'master'Stan Hu2018-03-061-1/+6
| | | | | | | | | | Fix for open-ended parameter's in lograge causing elastic memory issues See merge request gitlab-org/gitlab-ce!17419
| * Merge branch ↵Nick Thomas2018-03-063-1/+35
| | | | | | | | | | | | | | | | | | '43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bit' into 'master' Resolve "500 Error searching wiki: incompatible character encodings: UTF-8 and ASCII-8BIT" Closes #43531 See merge request gitlab-org/gitlab-ce!17413
| * Merge branch '43532-error-on-admin-applications-prometheus-template' into ↵Stan Hu2018-03-065-26/+77
| | | | | | | | | | | | | | | | | | 'master' Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template" Closes #43532 See merge request gitlab-org/gitlab-ce!17377
| * Merge branch '43261-fix-prometheus-installation' into 'master'Kamil Trzciński2018-03-062-0/+8
| | | | | | | | | | | | | | Disable RBAC on Prometheus values.yml Closes #43621 See merge request gitlab-org/gitlab-ce!17372
| * Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-03-063-4/+20
| | | | | | | | | | | | | | Fixed issue edit shortcut not working Closes #43560 See merge request gitlab-org/gitlab-ce!17360
| * Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-03-065-5/+23
| | | | | | | | | | Respond with more appropriate HTTP status code when repo does not exist See merge request gitlab-org/gitlab-ce!17341
| * Merge branch 'minimal-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-063-18/+63
| | | | | | | | | | | | | | Minimal fix for artifacts service Closes #43022 See merge request gitlab-org/gitlab-ce!17313
| * Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵Grzegorz Bizon2018-03-068-59/+108
| | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
| * Merge branch 'grpc-unavailable-restart' into 'master'Douwe Maan2018-03-067-131/+250
| | | | | | | | | | | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed Closes gitaly#1036 See merge request gitlab-org/gitlab-ce!17293
| * Merge branch 'zj-gitaly-encoding-issue' into 'master'Robert Speicher2018-03-063-52/+73
| | | | | | | | | | | | | | Encode revision for gitattributes ref Closes gitaly#1032 and #43278 See merge request gitlab-org/gitlab-ce!17291
| * Merge branch '43299-revert-bad-merge' into 'master'Phil Hughes2018-03-062-33/+36
|/ | | | | | | Resolve "Group Leave action is broken on Groups Dashboard and Homepage" Closes #43299 See merge request gitlab-org/gitlab-ce!17183
* Merge branch '10-5-stable' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2018-03-061-1/+1
|\ | | | | | | dev-10-5-stable
View Lorry Controller Status