summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...ee-5063-to-ce-backportTiago Botelho2018-03-211-2/+2
* Merge branch 'sh-fix-failure-project-destroy' into 'master'Robert Speicher2018-03-191-1/+5
|\
| * Fix "Can't modify frozen hash" error when project is destroyedsh-fix-failure-project-destroyStan Hu2018-03-161-1/+5
* | Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-177-53/+106
|\ \ | |/
| * Merge branch '41902-add-api-option-to-overwrite-project-description-on-projec...Grzegorz Bizon2018-03-161-1/+1
| |\
| | * Adds the option to override project description on export via APITiago Botelho2018-03-161-1/+1
| * | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-164-49/+93
| |\ \ | | |/ | |/|
| | * Use correct encoding with Lfs::FileTransfromerJames Edwards-Jones2018-03-152-5/+16
| | * Lfs::FileTranformer caches .gitattributes parserJames Edwards-Jones2018-03-151-1/+5
| | * Avoid failed integrity check by linking LfsObjectProjects soonerJames Edwards-Jones2018-03-153-35/+19
| | * Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-03-153-10/+55
| | * Rename Lfs::FileModificationHandler to Lfs::FileTransformerJames Edwards-Jones2018-03-152-2/+2
| * | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into...Stan Hu2018-03-151-1/+10
| |\ \ | | |/ | |/|
| | * Only cache highlight results for latest MR diffsSean McGivern2018-03-151-1/+10
| * | Merge branch 'dm-mirror-hard-failed-invites' into 'master'Robert Speicher2018-03-141-2/+2
| |\ \ | | |/ | |/|
| | * Prevent sending an access request to a project from failing when the project ...dm-mirror-hard-failed-invitesDouwe Maan2018-03-111-2/+2
* | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-153-3/+3
|/ /
* | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-121-2/+7
|\ \
| * | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-071-2/+7
* | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-091-9/+1
|\ \ \ | |_|/ |/| |
| * | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-081-9/+1
* | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-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
|\ \ \ \ \ | |_|_|_|/ |/| | | |