summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'import-symlinks-9-2' into 'security-9-2'James Edwards-Jones2017-08-081-1/+5
* Merge branch 'rs-alphanumeric-ssh-params-9-2' into 'security-9-2'James Edwards-Jones2017-08-081-0/+8
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-201-7/+22
* Merge branch '24570-use-re2-for-user-supplied-regexp' into 'security-9-2'Douwe Maan2017-07-193-4/+61
* Merge branch 'issue-title-leakage-9-2' into 'security-9-2'Robert Speicher2017-07-194-49/+5
* Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-212-3/+6
* Merge branch '32995-issue-contents-dynamically-replaced-with-stale-version-af...fix-9-2-stable-conflicts-for-mr-11964Adam Niedzielski2017-06-122-6/+7
* Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan2017-06-122-4/+10
* Merge branch 'fix/backup-restore-resume' into 'master'James Lopez2017-06-121-38/+37
* Merge branch '31556-ci-coverage-paralel-rspec' into 'master'Kamil Trzciński2017-06-081-23/+28
* Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-06-081-0/+3
* Merge branch '25934-project-snippet-vis' into 'security-9-2'Douwe Maan2017-06-029-10/+14
* Merge branch 'bvl-move-project-uploads-correctly' into 'security-9-2'Sean McGivern2017-06-021-1/+1
* Fix incorrect merge in 2c6fc0f.Timothy Andrew2017-05-311-0/+1
* Merge branch 'dz-api-x-frame' into 'security-9-2'Robert Speicher2017-05-311-0/+1
* Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-254-10/+193
* Merge branch 'sentry-clientside-releases' into 'master'Phil Hughes2017-05-241-0/+1
* Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-241-8/+9
* Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-241-1/+1
* Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew2017-05-231-1/+5
* Resolve migration helper conflictsmr-11396-conflictsBob Van Landuyt2017-05-221-13/+0
* [ci skip] Conflicts while picking !11396 into 9-2-stableYorick Peterse2017-05-221-0/+18
* Merge branch '9-2-stable-fix-conflicts-for-mr-11298' into '9-2-stable'Douwe Maan2017-05-191-8/+34
|\
| * Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'Douwe Maan2017-05-191-8/+34
* | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-191-0/+1
* | Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu2017-05-191-1/+0
|/
* Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-191-4/+4
* Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master'Douwe Maan2017-05-193-1/+16
* Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher2017-05-191-1/+1
* Merge branch 'reenable-gitaly-ref-name' into 'master'Robert Speicher2017-05-182-14/+14
* Merge branch 'dm-no-conflicts-when-branches-are-missing-9-2' into '9-2-stable'Regis Boudinot2017-05-191-1/+1
|\
| * Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing-9-2Douwe Maan2017-05-181-1/+1
* | Gitaly reuse stubsAndrew Newdigate2017-05-186-53/+38
|/
* Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-121-1/+1
* Use new SnippetsFinder signature in APIbvl-9-2-security-patchesBob Van Landuyt2017-05-101-2/+2
* Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-102-2/+2
* Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-104-8/+6
* Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-0/+4
* Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-101-18/+18
* Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-103-7/+20
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-091-4/+4
* Merge branch 'Add-index_redirect_routes_path_for_link-migration-to-setup_post...Sean McGivern2017-05-091-0/+1
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-081-1/+0
|\
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-021-1/+0
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-071-1/+3
|\ \
| * | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-1/+3
* | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-074-5/+6
|/ /
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-0612-33/+50
|\ \
| * | Refine inheritance model of extended CI/CD statusesGrzegorz Bizon2017-05-059-32/+16
| * | Introduce generic manual action extended status classGrzegorz Bizon2017-05-053-6/+26
View Lorry Controller Status