summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-25/+49
* | | | | Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-091-31/+60
* | | | | Merge branch 'markdown-xss-fix-option-2.1' into 'security'Douwe Maan2016-11-091-10/+28
* | | | | Merge branch 'issue_23548_dev' into 'master'Douwe Maan2016-11-099-14/+78
| |/ / / |/| | |
* | | | Merge branch 'faster_project_search' into 'master' Sean McGivern2016-11-081-18/+12
|\ \ \ \
| * | | | Faster searchfaster_project_searchValery Sizov2016-11-081-18/+12
* | | | | Merge branch 'dz-refactor-contraints' into 'master' Dmitriy Zaporozhets2016-11-084-32/+39
|\ \ \ \ \
| * | | | | Add small improvements to constrainers and specsDmitriy Zaporozhets2016-11-082-2/+2
| * | | | | Refactor routing constraintsDmitriy Zaporozhets2016-11-074-32/+39
* | | | | | Merge branch 'dz-refactor-namespace-regex' into 'master' Sean McGivern2016-11-081-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Refactor namespace regexdz-refactor-namespace-regexDmitriy Zaporozhets2016-11-071-0/+4
| |/ / / /
* | | | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-083-7/+16
|\ \ \ \ \
| * | | | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-3/+12
| * | | | | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-081-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' in...Sean McGivern2016-11-081-10/+6
|\ \ \ \
| * | | | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-061-12/+8
| * | | | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-061-2/+2
| |/ / /
* | | | Merge branch 'add-api-label-id' into 'master' Sean McGivern2016-11-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Expose Label id to APIRares Sfirlogea2016-11-071-1/+1
* | | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-072-53/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Refine Git garbage collectionJacob Vosmaer2016-11-042-53/+26
* | | | Ability to update labels priority via APIRobert Schilling2016-11-072-13/+31
| |/ / |/| |
* | | Merge branch 'split-out-markdown-cache-update' into 'master' Yorick Peterse2016-11-051-1/+5
|\ \ \ | |_|/ |/| |
| * | Split out markdown cache storage into a separate methodNick Thomas2016-11-041-1/+5
* | | Merge branch 'fix/gh-imported-labels-are-not-applied-correctly' into 'master' Sean McGivern2016-11-041-2/+9
|\ \ \
| * | | Cache imported GH labels no matter whatfix/gh-imported-labels-are-not-applied-correctlyAhmad Sherif2016-11-041-6/+3
| * | | Fix applying GitHub-imported labels when importing job is interruptedAhmad Sherif2016-11-041-0/+10
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-041-3/+3
|\ \ \
| * | | Return conflict error in label API when title is taken by group labellabels-apiDouwe Maan2016-10-201-3/+3
* | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-042-3/+7
|\ \ \ \
| * | | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-042-3/+7
| | |/ / | |/| |
* | | | Merge branch 'zj-grapify-project-hooks' into 'master' Rémy Coutable2016-11-041-84/+69
|\ \ \ \ | |/ / / |/| | |
| * | | Move shared params to a helperzj-grapify-project-hooksZ.J. van de Weg2016-11-041-39/+19
| * | | GrapeDSL for project hooksZ.J. van de Weg2016-11-041-69/+74
| | |/ | |/|
* | | Merge branch 'rs-update-rdoc' into 'master' Robert Speicher2016-11-041-7/+0
|\ \ \
| * | | Remove unused `gitlab:generate_docs` Rake taskrs-remove-sdocRobert Speicher2016-11-031-7/+0
| |/ /
* | | Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher2016-11-041-0/+3
|\ \ \
| * | | Backport Group API code that was added in EE onlybackport-ee-js-groups-apiRémy Coutable2016-10-311-0/+3
* | | | Merge branch '24059-round-robin-repository-storage' into 'master' Douwe Maan2016-11-042-2/+3
|\ \ \ \
| * | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-042-2/+3
| | |/ / | |/| |
* | | | Show log corresponding to env in admin/logsLukas Erlacher2016-11-031-2/+2
|/ / /
* | | Merge branch 'zj-expose-system-hooks' into 'master' Rémy Coutable2016-11-032-6/+10
|\ \ \
| * | | Update docs and unexpose tokenZeger-Jan van de Weg2016-11-022-1/+2
| * | | Be able to POST subscriptions for system hooksZ.J. van de Weg2016-10-311-2/+6
| * | | Expose more data on the SystemHooks APIZ.J. van de Weg2016-10-311-4/+3
* | | | Merge branch 'fix/import-export-symlink-vulnerability' into 'security'Douwe Maan2016-11-033-3/+24
* | | | Merge branch 'fix/import-projectmember-security' into 'security'Douwe Maan2016-11-033-12/+29
* | | | Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable2016-11-021-2/+4
|\ \ \ \