summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fixed Test for Notes SpecTim Zallmann2017-09-051-3/+2
* Fixes vulnerability in posting a comment in the temporary renderingTim Zallmann2017-09-051-0/+15
* Merge branch '9-5-stable' into 'security-9-5'Brian Neel2017-09-0430-278/+460
|\
| * Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'9-5-stable-patch-3Sean McGivern2017-09-025-28/+47
| * Revert "Make it possible to provide schema version in tests"Stan Hu2017-09-023-24/+25
| * Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into '...Sean McGivern2017-09-021-0/+2
| * Make it possible to provide schema version in testsGrzegorz Bizon2017-09-023-25/+24
| * Revert "Merge branch '37179-dashboard-project-dropdown' into 'master'"Phil Hughes2017-09-011-0/+15
| * Merge branch 'fly-out-nav-hiding-fix' into 'master'Filipa Lacerda2017-09-011-0/+27
| * Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-014-18/+17
| * Merge branch 'issue_36820' into 'master'Sean McGivern2017-09-011-0/+2
| * Merge branch 'rs-remove-filtered-issues-skips' into 'master'Douwe Maan2017-09-011-50/+0
| * Merge branch 'fix/import-events' into 'master'Sean McGivern2017-09-012-1/+6
| * Merge branch '37179-dashboard-project-dropdown' into 'master'Phil Hughes2017-09-011-15/+0
| * Merge branch 'fly-out-nav-jump-fix' into 'master'Tim Zallmann2017-09-011-25/+13
| * Merge branch 'changes-bar-sticky-fix' into 'master'Filipa Lacerda2017-09-011-0/+11
| * Merge branch 'mk-fix-user-namespace-rename' into 'master'Douwe Maan2017-09-013-3/+76
| * Merge branch 'fix-flakes' into 'master'Robert Speicher2017-09-013-3/+3
| * Merge branch 'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500...Kamil Trzciński2017-09-012-15/+27
| * Merge branch 'gitaly-9-5-2-patch' into '9-5-stable-patch-3'Robert Speicher2017-09-014-36/+50
| |\
| | * 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-244-36/+39
| * | Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-09-011-40/+151
| * | Merge branch 'backstage/gb/optimize-notification-specs' into 'master'Robert Speicher2017-09-012-67/+33
| * | Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'Robert Speicher2017-09-011-2/+1
| * | Merge branch 'sh-simplify-system-hook-testing' into 'master'Douwe Maan2017-09-011-27/+6
| * | Merge branch 'bugfix.notify-custom-participants' into 'master'Sean McGivern2017-09-011-3/+14
| * | Merge branch '36860-deleted-user-fix' into 'master'Sean McGivern2017-09-011-0/+14
* | | Merge branch 'fix-escape-commit-block' into 'security-9-5'Douwe Maan2017-09-041-0/+22
|\ \ \
| * | | Unmark the commit author/committer link as HTML-safeRobert Speicher2017-09-011-0/+22
* | | | Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-08-311-3/+17
|\ \ \ \
| * | | | Limit `style` attribute on `th` and `td` elements to specific propertiesRobert Speicher2017-08-101-3/+17
* | | | | Merge branch '36743-existing-repo-9-5' into 'security-9-5'Douwe Maan2017-08-3115-15/+117
|\ \ \ \ \
| * | | | | fix transient test failures caused by wrong dropdown triggerSimon Knox2017-08-293-3/+3
| * | | | | Fix import_file_specGabriel Mazetto2017-08-281-0/+1
| * | | | | Prevent new / renamed project from using a repository path that already exist...Gabriel Mazetto2017-08-2812-12/+113
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-08-302-2/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Disallow the `name` attribute on all user-provided markupRobert Speicher2017-08-162-2/+12
| | |/ / | |/| |
* | | | resolve conflicts from 4c7449e4d4ba9016acc6376f759856355d4fbe88Simon Knox2017-08-291-9/+1
* | | | Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4'Sean McGivern2017-08-291-0/+8
* | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-08-291-1/+17
* | | | Merge branch '9-5-stable' into security-9-5Simon Knox2017-08-291-1/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'sh-system-hooks-ldap-users' into 'master'Grzegorz Bizon2017-08-271-1/+16
* | | | Merge branch '9-5-stable' into security-9-5Gabriel Mazetto2017-08-278-27/+183
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-old-mr-diffs' into 'master'9-5-stable-patch-2Douwe Maan2017-08-251-4/+54
| * | | Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-252-0/+48
| * | | Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-251-6/+36
| * | | Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-251-3/+3
| * | | Merge branch 'rs-stub-storage-availability-check' into 'master'Douwe Maan2017-08-242-4/+10
| * | | Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-241-10/+32
| | |/ | |/|