summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-failure-project-destroy' into 'master'Robert Speicher2018-03-191-1/+5
* Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7James Lopez2018-03-193-12/+11
|\
| * Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-163-12/+11
* | Merge branch 'dm-mirror-hard-failed-invites' into 'master'10-6-stable-prepare-rc6Robert Speicher2018-03-161-2/+2
* | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-161-9/+1
|/
* Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-131-2/+7
* Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-081-1/+1
* Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-081-38/+2
|\
| * Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-071-38/+2
* | Merge branch 'backport-ee-3892-to-ce' into 'master'Douwe Maan2018-03-071-0/+2
|\ \
| * | Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/mer...backport-ee-3892-to-ceTiago Botelho2018-03-071-0/+2
* | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-073-1/+10
|\ \ \ | |/ / |/| |
| * | Use Project#source_of_merge_requests-relationBob Van Landuyt2018-03-071-1/+1
| * | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-072-0/+9
* | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-071-1/+1
|\ \ \ | |/ / |/| |
| * | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-071-1/+1
* | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-074-6/+10
|\ \ \ | |/ / |/| |
| * | Add discussion APIjprovazn-apiJan Provaznik2018-03-074-6/+10
* | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-063-3/+13
|\ \ \
| * \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0614-72/+98
| |\ \ \
| * | | | Bring one group board to CEFelipe Artur2018-03-033-3/+13
| | |/ / | |/| |
* | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-061-0/+36
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-0624-197/+334
| |\ \ \
| * | | | Implemente Prometheus:AdapterServicePawel Chojnacki2018-03-051-0/+36
* | | | | Merge branch 'proper-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-061-36/+0
|\ \ \ \ \
| * | | | | Add rake task. Adopt the latest fix. Drop CreateTraceArtifactServiceShinya Maeda2018-03-061-36/+0
| | |/ / / | |/| | |
* | | | | Merge branch '29130-api-project-export' into 'master'Sean McGivern2018-03-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | review: rename import_export to import_export_sharedTravis Miller2018-03-051-1/+1
| * | | | review: instantiate shared import/export object in project methodTravis Miller2018-02-281-1/+1
| * | | | Add project export API implementationTravis Miller2018-02-281-1/+1
* | | | | Introduce FailedToExtractError. Fix spec. Add DNS test mock.Shinya Maeda2018-03-061-7/+8
* | | | | Add empty line after custom error difinitionShinya Maeda2018-03-061-0/+1
* | | | | Fix commentShinya Maeda2018-03-061-1/+1
* | | | | Rework to minimize changesShinya Maeda2018-03-061-8/+15
* | | | | Merge branch 'sh-fix-issue-43871-system-hooks' into 'master'Robert Speicher2018-03-051-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Don't error out in system hook if user has `nil` datetime columnsStan Hu2018-03-051-2/+2
| | |_|/ | |/| |
* | | | Projects and groups badges APIFrancisco Javier López2018-03-054-0/+45
* | | | Merge branch 'wip-slash-command-on-mr-description' into 'master'Rémy Coutable2018-03-055-15/+25
|\ \ \ \
| * | | | Rename quick actions handlerOswaldo Ferreira2018-03-052-3/+3
| * | | | Move wip handling to MergeRequest::BaseServicewip-slash-command-on-mr-descriptionOswaldo Ferreira2018-03-015-355/+25
| * | | | /wip slash command on MR creationAdam Pahlevi2018-03-013-11/+351
| | |/ / | |/| |
* | | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-actionSean McGivern2018-03-021-5/+3
| |/ / |/| |
* | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-011-0/+36
|\ \ \
| * | | Increase lease timeout for CheckIngressIpAddressService to reduce polling fre...Dylan Griffith2018-02-251-1/+1
| * | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeDylan Griffith2018-02-231-2/+2
| |\ \ \
| * | | | Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changesDylan Griffith2018-02-231-16/+11
| * | | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeFilipa Lacerda2018-02-201-1/+16
| |\ \ \ \
| * | | | | Refactor ingress IP address waiting code (#42643)Dylan Griffith2018-02-202-15/+9
| * | | | | [ci skip] Merge branch 'master' into 42643-persist-external-ip-of-ingress-con...Filipa Lacerda2018-02-191-12/+16
| |\ \ \ \ \
| * | | | | | Ensure CheckIngressIpAddressService obtains exclusive lease per ingress contr...Dylan Griffith2018-02-151-0/+9
View Lorry Controller Status