summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.5.4v9.5.4Jose Ivan Vargas2017-09-061-1/+1
|
* Update CHANGELOG.md for 9.5.4Jose Ivan Vargas2017-09-068-30/+10
| | | [ci skip]
* Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-09-064-30/+33
| | | | | Upgrade mail and nokogiri gems due to security issues See merge request !13662
* Merge branch 'fix-comment-reflection' into 'security-9-5'Jacob Schatz2017-09-062-4/+21
|\ | | | | | | | | Fix Live Comment XSS Vulnerability See merge request gitlab/gitlabhq!2183
| * Added missing at signJose Ivan Vargas2017-09-051-3/+3
| |
| * Resetting the value just to be sure afterwards again through .text()Tim Zallmann2017-09-051-0/+3
| |
| * Fixed Test for Notes SpecTim Zallmann2017-09-051-3/+2
| |
| * Fixes vulnerability in posting a comment in the temporary renderingTim Zallmann2017-09-052-4/+19
|/
* Merge branch '9-5-stable' into 'security-9-5'Brian Neel2017-09-0490-540/+856
|\ | | | | | | | | Merge 9-5-stable into security-9-5 See merge request gitlab/gitlabhq!2184
| * Update VERSION to 9.5.3v9.5.3Jose Ivan Vargas2017-09-031-1/+1
| |
| * Update CHANGELOG.md for 9.5.3Jose Ivan Vargas2017-09-0317-80/+18
| | | | | | [ci skip]
| * Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'9-5-stable-patch-3Sean McGivern2017-09-025-28/+47
| | | | | | | | | | | | | | Improve migrations / background migrations testing strategy Closes #36303 See merge request !13589
| * Revert "Make it possible to provide schema version in tests"Stan Hu2017-09-023-24/+25
| | | | | | | | This reverts commit 775cee737b585cc7fa943af21c1d09141952cbfe.
| * Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into ↵Sean McGivern2017-09-021-0/+2
| | | | | | | | | | | | | | | | | | 'master' Clear schema cache after running tests for migrations Closes #37086 See merge request !13870
| * Make it possible to provide schema version in testsGrzegorz Bizon2017-09-023-25/+24
| |
| * Fixed spec errorsJose Ivan Vargas2017-09-011-2/+2
| |
| * Revert "Merge branch '37179-dashboard-project-dropdown' into 'master'"Phil Hughes2017-09-013-16/+20
| | | | | | | | | | This reverts commit 6d6223ecdb3b87a061aecf7b2c586cadc0f29695, reversing changes made to cc7811707424ebd58b71428c9fe27c444dd6169d.
| * Merge branch '36061-mr-ref-instrument' into 'master'Sean McGivern2017-09-012-0/+6
| | | | | | | | | | Instrument MergeRequest#fetch_ref See merge request !13980
| * Merge branch 'fly-out-nav-hiding-fix' into 'master'Filipa Lacerda2017-09-013-4/+42
| | | | | | | | | | | | | | Fixes the fly-out navigation flashing in & out Closes #37022 See merge request !13929
| * Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-0112-33/+31
| | | | | | | | | | | | | | Rollback changes made to signing_enabled. Closes #37202 See merge request !13956
| * Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-013-0/+9
| | | | | | | | | | | | | | Remove closing external issues by reference error Closes #36820 See merge request !13910
| * Merge branch '35838-remove-percent-in-zh-tw-translation' into ↵Robert Speicher2017-09-011-22/+8
| |\ | | | | | | | | | | | | | | | | | | '9-5-stable-patch-3' Update translation for zh-TW to remove percents See merge request !13988
| | * Update translation for zh-TW to remove percents35838-remove-percent-in-zh-tw-translationLin Jen-Shin2017-09-011-22/+8
| | | | | | | | | | | | | | | | | | This was synchronized from Crowdin: https://crowdin.com/project/gitlab-ee/zh-TW
| * | Merge branch '37194-fix-mr-widget-merge-button-dropdown-caret' into 'master'Phil Hughes2017-09-012-0/+6
| | | | | | | | | | | | | | | | | | | | | Fix "Merge when pipeline succeeds" button dropdown caret icon horizontal alignment Closes #37194 See merge request !13965
| * | Merge branch ↵Douwe Maan2017-09-013-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | 'pawel/bump_prometheus_client_mmap_version_to_fix_performance_degradation' into 'master' Update Prometheus Client MMAP gem to version that fixes performance degradation See merge request !13898
| * | Merge branch 'rs-remove-filtered-issues-skips' into 'master'Douwe Maan2017-09-011-50/+0
| | | | | | | | | | | | | | | Remove skipped examples in filtered issues feature spec See merge request !13845
| * | Merge branch 'fix/upgrade-gitaly-version' into 'master'Robert Speicher2017-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update Gitaly version to v0.35.0 Closes #36972 and gitaly#486 See merge request !13950
| * | Merge branch 'fix/import-events' into 'master'Sean McGivern2017-09-014-1/+15
| | | | | | | | | | | | | | | | | | | | | Fix events error importing GitLab projects Closes #36965 See merge request !13868
| * | Merge branch 'sh-filter-csrf-params' into 'master'Robert Speicher2017-09-012-11/+9
| | | | | | | | | | | | | | | Filter additional parameters that have shown up in our logs See merge request !13945
| * | Merge branch '37179-dashboard-project-dropdown' into 'master'Phil Hughes2017-09-013-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | Removes disabled state from projects dropdown in dashboard page Closes #37179 See merge request !13933
| * | Merge branch 'fly-out-nav-jump-fix' into 'master'Tim Zallmann2017-09-012-33/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fixed fly-out nav jumping Closes #36699 See merge request !13690
| * | Merge branch '37058-readme-md-header-image-scale-not-limited' into 'master'Phil Hughes2017-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | Resolve "README.md: Header image scale not limited" Closes #37058, #37024, and #37230 See merge request !13869
| * | Merge branch 'dropdown-z-index-update' into 'master'Filipa Lacerda2017-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Increase z-index of dropdowns Closes #36766 and #36866 See merge request !13889
| * | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2017-09-011-3/+2
| | | | | | | | | | | | | | | Update backup_restore.md documentation regarding S3 and IAM profiles. See merge request !13871
| * | Merge branch 'mr-index-eager-load' into 'master'Douwe Maan2017-09-012-1/+16
| | | | | | | | | | | | | | | Eager load head pipeline projects for MRs index See merge request !13877
| * | Merge branch 'fix-sidebar' into 'master'Annabel Dunstone Gray2017-09-011-1/+0
| | | | | | | | | | | | | | | | | | | | | Adds position fixed to right sidebar Closes #37144 See merge request !13494
| * | Merge branch 'changes-bar-sticky-fix' into 'master'Filipa Lacerda2017-09-014-1/+18
| | | | | | | | | | | | | | | | | | | | | Fixes the diff changes buttons from toggling when scrolling Closes #36698 See merge request !13894
| * | Merge branch 'mk-fix-user-namespace-rename' into 'master'Douwe Maan2017-09-015-4/+87
| | | | | | | | | | | | | | | | | | | | | Make username update fail if namespace update fails Closes gitlab-com/support-forum#2316 See merge request !13642
| * | Merge branch 'fix-flakes' into 'master'Robert Speicher2017-09-013-3/+3
| | | | | | | | | | | | | | | | | | | | | fix transient dropdown test failures Closes #37052 and #34436 See merge request !13862
| * | Merge branch ↵Kamil Trzciński2017-09-014-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1' into 'master' Fix pipeline trigger via API fails with 500 Internal Server Error in 9.5.1 Closes #37040 See merge request !13861
| * | Merge branch 'gitaly-9-5-2-patch' into '9-5-stable-patch-3'Robert Speicher2017-09-0115-85/+75
| |\ \ | | | | | | | | | | | | | | | | Refactor Gitlab::Git::Commit to include a repository and add missing specs See merge request !13815
| | * | Add spec for Gitlab::Git::Commit#rugged_commitgitaly-9-5-2-patchAlejandro Rodríguez2017-08-241-0/+11
| | | |
| | * | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-2415-85/+64
| | | |
| * | | Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-09-013-111/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dynamic navigation tunnel to fly-out menus Closes #35949 See merge request !13315
| * | | Merge branch 'backstage/gb/optimize-notification-specs' into 'master'Robert Speicher2017-09-012-67/+33
| | | | | | | | | | | | | | | | | | | | Optimize notification emails specs See merge request !13986
| * | | Merge branch '36582-fix-note-resolved-icon' into 'master'Fatih Acet2017-09-016-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update and fix resolvable note icons for easier recognition Closes #36582 See merge request !13821
| * | | Merge branch 'zj-update-templates-with-warning-header' into 'master'Stan Hu2017-09-013-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates to include header in the README Closes #36904 See merge request !13785
| * | | Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'Robert Speicher2017-09-011-2/+1
| | | | | | | | | | | | | | | | | | | | Improve flaky ACE editor spec See merge request !13854
| * | | Merge branch '36061-mr-ref' into 'master'Sean McGivern2017-09-012-0/+8
| | | | | | | | | | | | | | | | | | | | Instrument MergeRequest#ensure_ref_fetched See merge request !13876
| * | | Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-09-014-61/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify system hook testing and guarantee test will fire Closes #37067 See merge request !13858
View Lorry Controller Status