summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-025-60/+41
* Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass25251-actionview-template-error-undefined-method-text-for-nil-nilclassValery Sizov2016-12-021-1/+1
* Merge branch 'remove-gitlab-workhorse-version-option-from-install-task' into ...Robert Speicher2016-12-021-2/+2
|\
| * Don't allow to specify a repo or version when installing Workhorseremove-gitlab-workhorse-version-option-from-install-taskRémy Coutable2016-12-011-2/+2
* | Merge branch '4269-public-api' into 'master' Douwe Maan2016-12-022-10/+23
|\ \
| * | Allow public access to some Project API endpoints4269-public-apiRémy Coutable2016-12-012-10/+23
| |/
* | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-011-3/+5
|\ \
| * | 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
* | | Merge branch 'fix/github-importer' into 'master' Sean McGivern2016-12-011-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix branch validation for GitHub PR where repo/fork was renamed/deletedDouglas Barbosa Alexandre2016-12-011-1/+1
| |/
* | Merge branch 'improve_oauth_user_error' into 'master' Rémy Coutable2016-12-011-1/+1
|\ \
| * | Improve the `Gitlab::OAuth::User` error messageDrew Blessing2016-11-301-1/+1
* | | Merge branch '23718/backup-rake-task-human-readable' into 'master' Douwe Maan2016-12-011-7/+11
|\ \ \
| * | | Add Human Readable Timestamp to backup tar fileDavid Gerő2016-11-301-7/+11
* | | | Merge branch '22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-...Robert Speicher2016-12-015-176/+227
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-installRémy Coutable2016-11-304-192/+199
| * | | Add #run_command! to task helpers to raise a TaskFailedError if status is not 0Rémy Coutable2016-11-302-10/+28
| * | | New `gitlab:workhorse:install` rake taskRémy Coutable2016-11-303-37/+63
| |/ /
* | | 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
| | |_|/ | |/| |