summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Grapify runners APIRobert Schilling2016-11-101-53/+64
* 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
|\ \ \ \
| * | | | Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-tokenSean McGivern2016-11-011-1/+1
| * | | | Add support for token attr in project hooks APIGauvain Pocentek2016-11-012-3/+5
* | | | | Merge branch 'create_hooks_rake' into 'master' Rémy Coutable2016-11-021-3/+12
|\ \ \ \ \
| * | | | | Add Rake task to create/repair GitLab Shell hooks symlinksDrew Blessing2016-11-011-3/+12
* | | | | | require rails/generators for generatorsYorick Peterse2016-11-011-0/+2
* | | | | | Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-011-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-311-0/+13
* | | | | | Fix project features default valuesFelipe Artur2016-11-012-8/+10
* | | | | | Fix Markdown styling inside reference linkspanjan2016-11-015-42/+44
| |/ / / / |/| | | |
* | | | | Merge branch 'zj-grape-branches' into 'master' Rémy Coutable2016-11-011-66/+57
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | GrapeDSL for branches endpointszj-grape-branchesZ.J. van de Weg2016-10-311-66/+57
| | |/ / | |/| |
* | | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-312-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-282-3/+3
* | | | Ignore teaspoon tasks in production environmentwinniehell2016-10-291-18/+20
| |/ / |/| |
* | | Merge branch 'dz-internal-api-fullpath' into 'master' Dmitriy Zaporozhets2016-10-281-4/+9
|\ \ \ | |/ / |/| |
| * | Refactor storage path extraction from full repo pathdz-internal-api-fullpathDmitriy Zaporozhets2016-10-281-6/+1
| * | Make internal api work with full repo path instead of nameDmitriy Zaporozhets2016-10-271-4/+14
* | | Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-285-8/+8
|\ \ \
| * | | Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-285-8/+8
* | | | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-281-0/+19
|\ \ \ \
| * | | | Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-271-3/+7
| * | | | Add tests for optimistic lockingKamil Trzcinski2016-10-261-5/+7
| * | | | Use optimistic lockingKamil Trzcinski2016-10-261-0/+13
View Lorry Controller Status