summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-081-4/+5
* Revert "Cleanup after adding MR diff's commit_count"James Lopez2018-03-071-1/+1
* 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
| * | | | | | review: remove un-necessary current_application_settingsTravis Miller2018-02-281-1/+1
| * | | | | | review: instantiate shared import/export object in project methodTravis Miller2018-02-281-1/+1
| * | | | | | eliminate need or opts argument in shared objectTravis Miller2018-02-281-8/+3
| * | | | | | review: normalize shared initizlier argumentsTravis Miller2018-02-281-5/+6
| * | | | | | review: add feature introduction detailTravis Miller2018-02-281-2/+7
| * | | | | | Add project export API implementationTravis Miller2018-02-284-6/+51
| * | | | | | Add project export API entitiesTravis Miller2018-02-281-0/+15
* | | | | | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into...Rémy Coutable2018-03-061-0/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-0/+14
* | | | | | | Change column to file_sha256. Add test. Add changelogShinya Maeda2018-03-061-2/+2
* | | | | | | Add checksum at runner grape apiShinya Maeda2018-03-061-1/+2
* | | | | | | Make oauth provider login genericHoratiu Eugen Vlad2018-03-056-17/+79
* | | | | | | Projects and groups badges APIFrancisco Javier López2018-03-057-1/+215
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-uiRobert Speicher2018-03-051-1/+1
|\ \ \ \ \ \
| * | | | | | Cleanup after adding MR diff's commit_countJan Provaznik2018-03-051-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'kp-label-select-vue' into 'master'Phil Hughes2018-03-051-0/+1
|\ \ \ \ \ \
| * | | | | | Add `suggest_colors` from LabelsHelperKushal Pandya2018-03-051-0/+1
| |/ / / / /
* | | | | | Merge branch '42572-release-controller' into 'master'Robert Speicher2018-03-053-77/+106
|\ \ \ \ \ \
| * | | | | | Move constants and update for feedback42572-release-controllerLin Jen-Shin2018-03-032-5/+6
| * | | | | | Merge remote-tracking branch 'upstream/master' into 42572-release-controllerLin Jen-Shin2018-03-03169-2467/+4307
| |\ \ \ \ \ \