summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | another round of fixesMicaël Bergeron2018-03-013-0/+86
| * | | | | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2890-446/+1256
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2894-428/+1340
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-28202-1078/+3016
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-288-22/+18
| * | | | | | | | | | 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-283-3/+20
| * | | | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-2810-20/+21
| * | | | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-28139-1011/+2863
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-2/+2
| * | | | | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-28288-2151/+6093
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-28176-1329/+3656
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-28183-1767/+5243
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Merge branch 'zj-fix-resolver-issue' into 'master'Kamil Trzciński2018-02-281-0/+1
| * | | | | | | | | | | | | | Merge branch 'zj-improve-object-store-rake-task' into 'master'Kamil Trzciński2018-02-281-3/+6
| * | | | | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-283-5/+29
| * | | | | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e...Kamil Trzciński2018-02-28255-1943/+4794
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e...Kamil Trzciński2018-02-28218-2028/+4363
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-283-2/+21
* | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | ProtectedBranch API omits empty declared paramsJames Edwards-Jones2018-03-261-1/+2
* | | | | | | | | | | | | | | | Resolve "Forking with namespace doesn't work (API)"Jan2018-03-262-10/+2
* | | | | | | | | | | | | | | | Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-261-6/+1
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Add ?, !, and : to trailing puncutation excluded from auto-linkingSean McGivern2018-03-231-5/+6
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jprovazn-issueref' into 'master'Douwe Maan2018-03-231-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \