Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master' | Sean McGivern | 2018-03-07 | 2 | -9/+9 |
|\ | |||||
| * | Move OperationService#UserRemoveBranch | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move OperationService#UserCreateBranch | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move CommitService#Languages to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move RefService#CreateBranch to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move RefService#DeleteBranch to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move OperationService#UserRevert to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move OperationService#UserAddTag to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move CommitService::CommitPatch to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
| * | Move Repository#HasLocalBranches to OPT_OUT | Zeger-Jan van de Weg | 2018-03-07 | 1 | -1/+1 |
* | | Merge branch 'jprovazn-api' into 'master' | Sean McGivern | 2018-03-07 | 5 | -66/+307 |
|\ \ | |||||
| * | | Add discussion APIjprovazn-api | Jan Provaznik | 2018-03-07 | 5 | -66/+307 |
* | | | Merge branch 'replace_redcarpet_with_cmark' into 'master' | Sean McGivern | 2018-03-07 | 8 | -35/+153 |
|\ \ \ | |||||
| * | | | Add CommonMark markdown enginereplace_redcarpet_with_cmark | blackst0ne | 2018-03-07 | 8 | -35/+153 |
* | | | | Count discussions on issues and merge requests as contributions for the contr... | Riccardo Padovani | 2018-03-07 | 1 | -1/+1 |
* | | | | Merge branch 'master' into 'master' | Grzegorz Bizon | 2018-03-07 | 1 | -6/+9 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | CI charts now include the current day | Dakkaron | 2018-03-06 | 1 | -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-docs | Nick Thomas | 2018-03-07 | 3 | -9/+10 |
|\ \ \ \ | |||||
| * | | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetch | Stan Hu | 2018-03-06 | 3 | -9/+10 |
* | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EE | Mario de la Ossa | 2018-03-06 | 1 | -0/+8 |
* | | | | | Merge branch 'banzai-n-plus-one' into 'master' | Douwe Maan | 2018-03-06 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Add Gitaly N+1 notice for Banzai filtering | Alejandro Rodríguez | 2018-03-05 | 1 | -1/+2 |
* | | | | | | Merge branch 'sha256-checksum-for-trace' into 'master' | Kamil Trzciński | 2018-03-06 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Set sha256 checksum when archiving traces | Shinya Maeda | 2018-03-07 | 1 | -1/+2 |
* | | | | | | | Merge branch 'issue_38337' into 'master' | Sean McGivern | 2018-03-06 | 2 | -0/+118 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into 'issue_38337' | Felipe Artur | 2018-03-06 | 49 | -269/+930 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Address review comments | Felipe Artur | 2018-03-05 | 1 | -1/+1 |
| * | | | | | | | | Bring one group board to CE | Felipe Artur | 2018-03-03 | 2 | -0/+118 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'prepend-grape-api-ce' into 'master' | Rémy Coutable | 2018-03-06 | 1 | -21/+40 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ce | Lin Jen-Shin | 2018-03-06 | 1 | -21/+40 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master' | Grzegorz Bizon | 2018-03-06 | 8 | -16/+53 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-ce | Pawel Chojnacki | 2018-03-06 | 127 | -2302/+3820 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Squashed commit of the following: | Pawel Chojnacki | 2018-02-24 | 8 | -16/+53 |
* | | | | | | | | Merge branch 'extract-job-artifacts-api-ce' into 'master' | Rémy Coutable | 2018-03-06 | 1 | -4/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Unify lib/api/job_artifacts.rb with EEextract-job-artifacts-api-ce | Lin Jen-Shin | 2018-03-06 | 1 | -4/+13 |
* | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2018-03-06 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add Turkish, Filipino and Indonesianbvl-port-of-ee-translations | Bob Van Landuyt | 2018-03-05 | 1 | -1/+4 |
* | | | | | | | | | | Merge branch 'proper-fix-for-artifacts-service' into 'master' | Grzegorz Bizon | 2018-03-06 | 2 | -0/+70 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Integrate two workers into one ArchiveTraceWorker with pipeline_background qu... | Shinya Maeda | 2018-03-06 | 1 | -1/+1 |
| * | | | | | | | | | | Define Trace::ArchiveError to make it explit as an error | Shinya Maeda | 2018-03-06 | 1 | -3/+5 |
| * | | | | | | | | | | Fix static analysys | Shinya Maeda | 2018-03-06 | 1 | -0/+1 |
| * | | | | | | | | | | Fix rake task to use corrrect SQL | Shinya Maeda | 2018-03-06 | 1 | -5/+4 |
| * | | | | | | | | | | Raise an error if conditions are not fulfilled in archive method | Shinya Maeda | 2018-03-06 | 1 | -1/+2 |
| * | | | | | | | | | | Add soec for achevie! method. Fixed the method | Shinya Maeda | 2018-03-06 | 1 | -5/+6 |
| * | | | | | | | | | | Use find_in_batches for rake task | Shinya Maeda | 2018-03-06 | 1 | -3/+11 |
| * | | | | | | | | | | Add rake task. Adopt the latest fix. Drop CreateTraceArtifactService | Shinya Maeda | 2018-03-06 | 2 | -12/+39 |
| * | | | | | | | | | | Proper fix for artifacts trace migration which is fully safe | Kamil Trzciński | 2018-03-06 | 1 | -0/+31 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '29130-api-project-export' into 'master' | Sean McGivern | 2018-03-06 | 5 | -6/+67 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | review: prefix un-used argument with underscore | Travis Miller | 2018-03-05 | 1 | -1/+1 |
| * | | | | | | | | | review: rename import_export to import_export_shared | Travis Miller | 2018-03-05 | 1 | -1/+1 |