summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-274-3/+190
|\
| * Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2238-107/+666
| |\
| * | Fix http_io to make it return path is nilShinya Maeda2018-03-221-1/+1
| * | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-221-0/+4
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-08115-2152/+3197
| |\ \
| * | | [cherry-pick] '4862-verify-file-checksums'Sean McGivern2018-03-084-0/+171
| * | | fix some broken specsMicaël Bergeron2018-03-061-1/+4
| * | | removed EE specific code from the portMicaël Bergeron2018-03-011-0/+183
| * | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2863-397/+908
| |\ \ \
| * \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2864-379/+1024
| |\ \ \ \
| * \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-28129-873/+2679
| |\ \ \ \ \
| | * | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-286-18/+14
| * | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-2/+10
| * | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master'Grzegorz Bizon2018-02-281-0/+12
| * | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-286-13/+14
* | | | | | | Merge branch 'fix/ldap_wihtout_user' into 'master'Douwe Maan2018-03-274-18/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix LDAP login without user in DBHoratiu Eugen Vlad2018-03-274-18/+13
* | | | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into 'master'Kamil Trzciński2018-03-268-93/+197
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make stage seed instance variables less ambiguousbackstage/gb/populating-pipeline-refactoringGrzegorz Bizon2018-03-261-4/+4
| * | | | | | | Fix static analysis and tests related to YAML processingGrzegorz Bizon2018-03-221-30/+14
| * | | | | | | Add specs for pipeline chain that builds stages and jobsGrzegorz Bizon2018-03-222-10/+10
| * | | | | | | Do not select included stage seeds in populate chainGrzegorz Bizon2018-03-221-5/+2
| * | | | | | | Decouple YAML processor from pipeline objectsGrzegorz Bizon2018-03-221-34/+14
| * | | | | | | Move policy related specs our of YAML processor testsGrzegorz Bizon2018-03-222-5/+11
| * | | | | | | Fix rubocop offense in pipeline build seed classGrzegorz Bizon2018-03-221-13/+11
| * | | | | | | Add a guard clause to avoid creating empty stagesGrzegorz Bizon2018-03-211-0/+3
| * | | | | | | Evaluate only/except policies outside of YAML processorGrzegorz Bizon2018-03-213-9/+57
| * | | | | | | Make it easier to test pipeline stage seedsGrzegorz Bizon2018-03-215-17/+17
| * | | | | | | Reduce stage seeds coupling between pipeline and YAMLGrzegorz Bizon2018-03-212-6/+6
| * | | | | | | Add specs for chain element that populates a pipelineGrzegorz Bizon2018-03-211-1/+7
| * | | | | | | Populate pipeline with objects before creating itGrzegorz Bizon2018-03-213-9/+32
| * | | | | | | Remove legacy service for creating pipeline stagesGrzegorz Bizon2018-03-213-11/+6
| * | | | | | | Decouple pipeline stage seeds from building environmentsGrzegorz Bizon2018-03-213-7/+20
| * | | | | | | Support building all pipeline resource before savingGrzegorz Bizon2018-03-213-24/+34
| * | | | | | | Introduce pipeline build seedsGrzegorz Bizon2018-03-212-23/+40
| * | | | | | | Start building abstraction over pipeline seedsGrzegorz Bizon2018-03-214-67/+87
| * | | | | | | Instantiate pipeline stages and builds before savingGrzegorz Bizon2018-03-191-13/+17
* | | | | | | | Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-234-10/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern2018-03-234-10/+18
* | | | | | | | | Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-231-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix EncodingHelper#clean blowing up on UTF-16BE stringsfix/encoding-helper-clean-blowing-up-on-utf-16beAhmad Sherif2018-03-221-1/+1
* | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-2311-14/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-2111-14/+49
* | | | | | | | | | Merge branch 'ci-pipeline-commit-lookup' into 'master'Kamil Trzciński2018-03-221-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use porcelain commit lookup method on CI::CreatePipelineServiceci-pipeline-commit-lookupAlejandro Rodríguez2018-03-221-4/+4
* | | | | | | | | | Merge branch 'latest-security-to-master-21-03-18' into 'master'Douwe Maan2018-03-223-10/+58
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-224-23/+136
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-213-10/+58
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/remove-wiki-cache-clear' into 'master'Sean McGivern2018-03-221-3/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clearAhmad Sherif2018-03-211-3/+0
| |/ / / / / / / /
View Lorry Controller Status