summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
| | |/ | |/|
* | | Merge branch '9-5-stable' into security-9-5Gabriel Mazetto2017-08-2411-209/+358
|\ \ \ | |/ /
| * | Merge branch 'fix/gb/fix-head-pipeline-when-pipeline-has-errors' into 'master'Kamil Trzciński2017-08-221-12/+46
| * | Merge branch 'fix-broadcast-message-caching' into 'master'Sean McGivern2017-08-221-0/+23
| * | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-221-35/+47
| * | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-222-11/+53
| * | Merge branch 'gitaly-tree-entries-encoding' into 'master'Robert Speicher2017-08-221-0/+14
| * | Merge branch 'rs-git-access-spec-speed' into 'master'Douwe Maan2017-08-221-133/+116
| * | Merge branch 'only-limit-fetch-when-requested' into 'master'Robert Speicher2017-08-221-17/+33
| * | Merge branch '36458-user-profile-activity-feed-contains-broken-image-links' i...Phil Hughes2017-08-221-0/+6
| * | Merge branch 'issue-boards-closed-shows-empty-label' into 'master'Tim Zallmann2017-08-221-0/+19
| * | Ensure Rugged methods are called with a Rugged Commitgitaly-9-5-patchAlejandro Rodríguez2017-08-211-1/+1
* | | Merge branch '9-5-stable' into security-9-5Gabriel Mazetto2017-08-23102-650/+2376
|\ \ \ | |/ /
| * | Merge branch 'sh-fix-atom-feeds' into 'master'Sean McGivern2017-08-211-0/+6
| * | Merge branch 'fly-out-update-for-stable' into '9-5-stable'Tim Zallmann2017-08-211-151/+38
| |\ \
| | * | fixes for sidebar jumpingfly-out-update-for-stablePhil Hughes2017-08-191-23/+10
| | * | Fixes the stable branches fly out nav JSPhil Hughes2017-08-181-128/+28
| * | | Merge branch '34533-speed-up-group-project-authorizations' into 'master'9-5-stable-prepare-RC6Douwe Maan2017-08-181-0/+30
| * | | Merge branch '36630-activerecord-statementinvalid-pg-notnullviolation-error-n...Grzegorz Bizon2017-08-181-0/+11
| * | | Merge branch '35072-fix-pages-delete' into 'master'Sean McGivern2017-08-181-0/+38
| * | | Merge branch 'tc-git-tower-pagination-links' into 'master'Grzegorz Bizon2017-08-181-4/+48
| * | | Merge branch 'issue_35580' into 'master'Rémy Coutable2017-08-182-20/+118
| * | | Merge branch '36450_second_touch_up' into 'master'Clement Ho2017-08-181-1/+1
| * | | Merge branch 'zj-fix-fe-posting-value' into 'master'Kamil Trzciński2017-08-181-1/+1
| * | | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-184-70/+84
| |/ /
| * | Merge branch 'help-page-spec-fix' into 'master'9-5-stable-prepare-rc5Rémy Coutable2017-08-171-1/+1
| * | Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-161-0/+35
| * | Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-166-0/+84
| * | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1623-69/+1125
| * | Merge branch 'dispatcher-race-condition-fix' into 'master'Tim Zallmann2017-08-162-4/+8
| * | Merge branch '36430-edit-milestone-link' into 'master'Grzegorz Bizon2017-08-161-2/+27
| * | Merge branch 'rs-redis-config-paths' into 'master'Douwe Maan2017-08-161-0/+7
| * | Merge branch '36465-duplicate-events' into 'master'Douwe Maan2017-08-162-0/+36