summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-10218-2406/+5902
|\
| * Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-101-46/+30
| |\
| | * Grapify token APIRobert Schilling2016-11-101-46/+30
| * | Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master' Robert Speicher2016-11-102-82/+96
| |\ \
| | * | Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_che...23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-102-82/+96
| | |/
| * | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-101-54/+57
| |\ \
| | * | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-101-54/+57
| * | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-101-53/+64
| |\ \ \
| | * | | Grapify runners APIRobert Schilling2016-11-101-53/+64
| | |/ /
| * | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-101-10/+9
| |\ \ \
| | * | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-091-10/+9
| | |/ /
| * | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-101-0/+10
| |\ \ \ | | |_|/ | |/| |
| | * | Added API endpoint groups/ownedBorja Aparicio2016-11-081-0/+10
| * | | Merge branch '23731-add-param-to-user-api' into 'master' Sean McGivern2016-11-091-1/+6
| |\ \ \
| | * | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-081-1/+6
| * | | | Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-092-13/+34
| |\ \ \ \
| | * | | | Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-082-13/+34
| * | | | | 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
| | | |/ / | | |/| |