summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-301-1/+1
* add transparent namespace to all user-generated anchors in GitLab flavored ma...Mike Greiling2016-11-301-3/+5
* Allow access to the wiki with git when repository feature disabledDouglas Barbosa Alexandre2016-11-302-1/+13
* Merge branch 'api-branch-status' into 'master' Rémy Coutable2016-11-301-1/+5
|\
| * API: Expose branch statusapi-branch-statusRobert Schilling2016-11-301-1/+5
* | Merge branch 'grapify-files-api' into 'master' Rémy Coutable2016-11-301-93/+60
|\ \
| * | Grapify the files APIgrapify-files-apiRobert Schilling2016-11-301-93/+60
| |/
* | Merge branch 'grapify-projects-api' into 'master' Rémy Coutable2016-11-302-337/+267
|\ \
| * | Grapify the projects APIgrapify-projects-apiRobert Schilling2016-11-282-337/+267
| |/
* | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-291-1/+1
* | Merge branch '24880-configurable-plaintext-emails' into 'master' Sean McGivern2016-11-291-0/+13
|\ \
| * | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+13
* | | Merge branch 'zj-issue-search-slash-command' into 'master' Kamil Trzciński2016-11-294-8/+20
|\ \ \
| * | | Add issue search slash commandzj-issue-search-slash-commandZ.J. van de Weg2016-11-254-8/+20
* | | | Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' Douwe Maan2016-11-283-5/+3
* | | | Merge branch 'zj-fix-label-creation-non-members' into 'security'Douwe Maan2016-11-283-61/+37
| |_|/ |/| |
* | | Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan2016-11-281-7/+0
|\ \ \
| * | | Refresh project authorizations using a Redis leaserefresh-authorizations-with-leaseYorick Peterse2016-11-251-7/+0
* | | | Merge branch 'zj-expose-coverage-pipelines' into 'master' Rémy Coutable2016-11-251-0/+1
|\ \ \ \
| * | | | Expose coverage on GET pipelines/:idzj-expose-coverage-pipelinesZ.J. van de Weg2016-11-251-0/+1
* | | | | Merge branch 'timeout-merge-request-for-binary-file' into 'master' Yorick Peterse2016-11-251-3/+3
|\ \ \ \ \
| * | | | | Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-fileValery Sizov2016-11-251-3/+3
* | | | | | Merge branch 'zj-slash-commands-improvements' into 'master' 24769-make-mattermost-command-easier-to-configureKamil Trzciński2016-11-251-1/+1
|\ \ \ \ \ \
| * | | | | | Accept a valid ref for issue showZ.J. van de Weg2016-11-251-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse2016-11-257-12/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_projectRémy Coutable2016-11-244-7/+15
| * | | | | API: Introduce `#find_project!` which also check access permissionRémy Coutable2016-11-242-8/+11
| * | | | | API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable2016-11-242-2/+2
| * | | | | Make API::Helpers find a project with only one queryRémy Coutable2016-11-241-1/+6
* | | | | | Merge branch 'api-no-convert' into 'master' Rémy Coutable2016-11-244-4/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't convert data which already is the target typeapi-no-convertRobert Schilling2016-11-244-4/+4
| |/ / / /
* | | | | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-245-37/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-235-37/+37
| | |_|/ | |/| |
* | | | Use Commit#author so we share logic and cacheLin Jen-Shin2016-11-241-4/+2
| |/ / |/| |
* | | Merge branch 'api-delete-group-share' into 'master' Rémy Coutable2016-11-231-0/+13
|\ \ \
| * | | API: Add endpoint to delete a group shareapi-delete-group-shareRobert Schilling2016-11-231-0/+13
* | | | Merge branch 'grapify-sidekiq-metric-api' into 'master' Rémy Coutable2016-11-231-32/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Grapify the sidekiq metrics APIRobert Schilling2016-11-231-32/+4
| |/ /
* | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-232-1/+3
|\ \ \
| * | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-232-1/+3
* | | | Merge branch 'post_receive-any-email' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \ \
| * | | | post_receive: accept any user email from last commitElan Ruusamäe2016-11-041-1/+1
* | | | | Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master' Rémy Coutable2016-11-231-2/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable2016-11-231-2/+6
* | | | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan2016-11-232-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issueJames Lopez2016-11-232-1/+3
| | |_|/ | |/| |
* | | | Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński2016-11-221-2/+4
|\ \ \ \
| * | | | Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-createZ.J. van de Weg2016-11-221-2/+4
| | |_|/ | |/| |
* | | | Merge branch 'fix-api-iid-filter' into 'master' Rémy Coutable2016-11-222-6/+4
|\ \ \ \
| * | | | Fix IID filter for merge requests and milestonesRobert Schilling2016-11-222-6/+4
| |/ / /