summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-072-9/+9
|\
| * Move OperationService#UserRemoveBranchZeger-Jan van de Weg2018-03-071-1/+1
| * Move OperationService#UserCreateBranchZeger-Jan van de Weg2018-03-071-1/+1
| * Move CommitService#Languages to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * Move RefService#CreateBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * Move RefService#DeleteBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * Move OperationService#UserRevert to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * Move OperationService#UserAddTag to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * Move CommitService::CommitPatch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| * Move Repository#HasLocalBranches to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
* | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-075-66/+307
|\ \
| * | Add discussion APIjprovazn-apiJan Provaznik2018-03-075-66/+307
* | | Merge branch 'replace_redcarpet_with_cmark' into 'master'Sean McGivern2018-03-078-35/+153
|\ \ \
| * | | Add CommonMark markdown enginereplace_redcarpet_with_cmarkblackst0ne2018-03-078-35/+153
* | | | Count discussions on issues and merge requests as contributions for the contr...Riccardo Padovani2018-03-071-1/+1
* | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-071-6/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | CI charts now include the current dayDakkaron2018-03-061-6/+9
* | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-073-9/+10
|\ \ \ \
| * | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-063-9/+10
* | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-061-0/+8
* | | | | Merge branch 'banzai-n-plus-one' into 'master'Douwe Maan2018-03-061-1/+2
|\ \ \ \ \
| * | | | | Add Gitaly N+1 notice for Banzai filteringAlejandro Rodríguez2018-03-051-1/+2
* | | | | | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-061-1/+2
|\ \ \ \ \ \
| * | | | | | Set sha256 checksum when archiving tracesShinya Maeda2018-03-071-1/+2
* | | | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-062-0/+118
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0649-269/+930
| |\ \ \ \ \ \ \
| * | | | | | | | Address review commentsFelipe Artur2018-03-051-1/+1
| * | | | | | | | Bring one group board to CEFelipe Artur2018-03-032-0/+118
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'prepend-grape-api-ce' into 'master'Rémy Coutable2018-03-061-21/+40
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-068-16/+53
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-06127-2302/+3820
| |\ \ \ \ \ \
| * | | | | | | Squashed commit of the following:Pawel Chojnacki2018-02-248-16/+53
* | | | | | | | Merge branch 'extract-job-artifacts-api-ce' into 'master'Rémy Coutable2018-03-061-4/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Unify lib/api/job_artifacts.rb with EEextract-job-artifacts-api-ceLin Jen-Shin2018-03-061-4/+13
* | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-03-061-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Turkish, Filipino and Indonesianbvl-port-of-ee-translationsBob Van Landuyt2018-03-051-1/+4
* | | | | | | | | | Merge branch 'proper-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-03-062-0/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Integrate two workers into one ArchiveTraceWorker with pipeline_background qu...Shinya Maeda2018-03-061-1/+1
| * | | | | | | | | | Define Trace::ArchiveError to make it explit as an errorShinya Maeda2018-03-061-3/+5
| * | | | | | | | | | Fix static analysysShinya Maeda2018-03-061-0/+1
| * | | | | | | | | | Fix rake task to use corrrect SQLShinya Maeda2018-03-061-5/+4
| * | | | | | | | | | Raise an error if conditions are not fulfilled in archive methodShinya Maeda2018-03-061-1/+2
| * | | | | | | | | | Add soec for achevie! method. Fixed the methodShinya Maeda2018-03-061-5/+6
| * | | | | | | | | | Use find_in_batches for rake taskShinya Maeda2018-03-061-3/+11
| * | | | | | | | | | Add rake task. Adopt the latest fix. Drop CreateTraceArtifactServiceShinya Maeda2018-03-062-12/+39
| * | | | | | | | | | Proper fix for artifacts trace migration which is fully safeKamil Trzciński2018-03-061-0/+31
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '29130-api-project-export' into 'master'Sean McGivern2018-03-065-6/+67
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | review: prefix un-used argument with underscoreTravis Miller2018-03-051-1/+1
| * | | | | | | | | review: rename import_export to import_export_sharedTravis Miller2018-03-051-1/+1