summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'clean-up-issue_spec.js' into 'master' Rémy Coutable2016-10-281-0/+23
|\ \ \ \
| * | | | Replace static issue fixtures by script (!6059)winniehell2016-10-281-0/+23
* | | | | Merge branch 'fix/make-github-import-retryable' into 'master' Sean McGivern2016-10-288-23/+112
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typosfix/make-github-import-retryableAhmad Sherif2016-10-282-2/+2
| * | | | Abstract the use of imported[!?] and {current,increment}_page in GitHub importerAhmad Sherif2016-10-281-50/+34
| * | | | Use public_send instead of sendAhmad Sherif2016-10-281-1/+1
| * | | | Modify GitHub importer to be retryableAhmad Sherif2016-10-287-25/+130
* | | | | Merge branch '23890-api-should-accepts-boolean' into 'master' Sean McGivern2016-10-281-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | API: Fix booleans not recognized as such when using the `to_boolean` helper23890-api-should-accepts-booleanRémy Coutable2016-10-271-0/+1
| | |/ / | |/| |
* | | | Merge branch 'fix/gh-import-bugs' into 'master' Sean McGivern2016-10-282-13/+23
|\ \ \ \ | |/ / / |/| | |
| * | | Fix importing MR comments from GitHubfix/gh-import-bugsAhmad Sherif2016-10-271-6/+7
| * | | Fix applying labels for GitHub-imported MRsAhmad Sherif2016-10-272-7/+16
| | |/ | |/|
* | | Merge branch '21645-mail_room_sentinel'Douwe Maan2016-10-272-1/+14
|\ \ \ | |/ / |/| |
View Lorry Controller Status