summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused expressions policy from ci/cd configfeature/gb/add-complex-jobs-only-except-config-policyGrzegorz Bizon2017-08-302-39/+0
* Simplify code for appending strategies in CI/CD configGrzegorz Bizon2017-08-301-2/+2
* Raise exception when simplifiable ci entry incompleteGrzegorz Bizon2017-08-302-0/+17
* Fix rubocop offense in YAML processor specsGrzegorz Bizon2017-08-261-1/+0
* Add specs for attributable aspect of ci config entryGrzegorz Bizon2017-08-252-6/+25
* Fix Rubocop offense in CI/CD only/except policy classGrzegorz Bizon2017-08-251-1/+1
* Improve reporting of a CI/CD entry config locationGrzegorz Bizon2017-08-257-31/+36
* Simplify ci config entry validator implementationGrzegorz Bizon2017-08-251-7/+2
* Use only/except policy that returns an arrayGrzegorz Bizon2017-08-252-5/+1
* Fix CI/CD trigger policy default valueGrzegorz Bizon2017-08-252-0/+9
* Add specs for a simplifiable CI/CD entry aspectGrzegorz Bizon2017-08-251-0/+75
* Implement complex only/except policy CI/CD configGrzegorz Bizon2017-08-253-4/+54
* Make it possible to define CI/CD config strategiesGrzegorz Bizon2017-08-253-35/+88
* Use aspect-oriented design in CI/CD config entriesGrzegorz Bizon2017-08-246-37/+36
* Rename CI/CD job triggering policy class to PolicyGrzegorz Bizon2017-08-243-5/+5
* Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-235-4/+45
|\
| * Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-226-5/+46
* | Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-233-9/+46
|\ \
| * | Remove tooltip from filtered search userremove-tooltip-filtered-search-userClement Ho2017-08-223-9/+46
* | | Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-237-11/+62
|\ \ \
| * | | Fix display of push events for removed refsfix-push-events-branch-removalsYorick Peterse2017-08-227-11/+62
* | | | Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into '...Douwe Maan2017-08-235-1/+107
|\ \ \ \
| * | | | Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projectsToon Claes2017-08-222-26/+22
| * | | | Migration to remove pending delete projects with non-existing namespaceToon Claes2017-08-225-1/+111
* | | | | Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-233-16/+17
|\ \ \ \ \
| * | | | | Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-222-10/+15
| * | | | | Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher2017-08-221-6/+2
* | | | | | Merge branch 'rs-stub-storage-availability-check' into 'master'Douwe Maan2017-08-232-1/+13
|\ \ \ \ \ \
| * | | | | | Stub `ForkedStorageCheck.storage_available?` by default in all specsrs-stub-storage-availability-checkRobert Speicher2017-08-222-1/+13
* | | | | | | Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-233-16/+40
|\ \ \ \ \ \ \
| * | | | | | | Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-223-16/+40
* | | | | | | | Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
* | | | | | | | | Merge branch '33503-new-icons-for-system-notes' into 'master'Clement Ho2017-08-2316-18/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement new system note iconsBryce Johnson2017-08-2316-18/+29
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-group-policy-specs-on-mysql' into 'master'Robert Speicher2017-08-221-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes group policy specs on MySQL.fix-group-policy-specs-on-mysqlTiago Botelho2017-08-221-0/+6
* | | | | | | | | | Merge branch 'rs-fix-master' into 'master'Stan Hu2017-08-222-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Add `:nested_groups` metadata to two subgroup-related specsRobert Speicher2017-08-222-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36779-update-kubernetes-install-docs' into 'master'Marcia Ramos2017-08-224-3/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Apply feedbackJoshua Lambert2017-08-221-1/+1
| * | | | | | | | | Fix spacing with code block36779-update-kubernetes-install-docsJoshua Lambert2017-08-223-0/+5
| * | | | | | | | | Add link to cloud native charts, add helm init infoJoshua Lambert2017-08-224-3/+23
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36496-badges-should-not-be-huge' into 'master'Clement Ho2017-08-221-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sometimes you don't see the forrest because of all the trees, set now the pre...36496-badges-should-not-be-hugeTim Zallmann2017-08-181-0/+3
* | | | | | | | | | Merge branch 'update-monaco-loader-test' into 'master'Jacob Schatz2017-08-224-13/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add global __webpack_public_path__ to eslint configupdate-monaco-loader-testMike Greiling2017-08-184-7/+4
| * | | | | | | | | | fix monaco loader test to not break with statically analyzed import statementsMike Greiling2017-08-181-7/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs-merge-request-diff-nav' into 'master'Marcia Ramos2017-08-222-0/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | img/merge_request_diff_file_navigation.pngVictor Wu2017-08-221-0/+0