summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Fix issuable state indicatorJan Provaznik2018-03-231-1/+9
* | | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-2317-27/+64
|\ \ \ \ | |/ / / |/| | |
| * | | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-2117-27/+64
* | | | 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-225-21/+76
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-226-33/+137
| |\ \ \ \
| * | | | | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18Francisco Javier López2018-03-211-1/+1
| * | | | | Adapting mattermost to the new way of calling HTTPFrancisco Javier López2018-03-211-1/+1
| * | | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-215-20/+75
| | |/ / / | |/| | |
* | | | | 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
| |/ / /
* | | | Merge branch 'sh-fix-readonly-reload' into 'master'Sean McGivern2018-03-221-1/+1
|\ \ \ \
| * | | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ...Stan Hu2018-03-211-1/+1
* | | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-221-0/+75
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | OmniauthInitializer refactoringjej/omniauth-initializer-refactorJames Edwards-Jones2018-03-221-33/+31
| * | | | Omniauth callbacks moved to methodsJames Edwards-Jones2018-03-201-26/+38
| * | | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-201-0/+65
* | | | | Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-221-4/+8
|\ \ \ \ \
| * | | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-211-4/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'remove-parser-warnings-workaround' into 'master'Robert Speicher2018-03-211-9/+0
|\ \ \ \ \