summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-092776-34184/+66618
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix rubocop offense in build stage migration classesGrzegorz Bizon2018-01-062-5/+3
| * | | | | | | | | | | | | | | Randomize build ids in stages migration test dataGrzegorz Bizon2018-01-061-7/+7
| * | | | | | | | | | | | | | | Do not attempt to migrate legacy pipeline stagesGrzegorz Bizon2018-01-062-13/+25
| * | | | | | | | | | | | | | | Reduce batch size of stages we schedule for a migrationGrzegorz Bizon2018-01-061-1/+1
| * | | | | | | | | | | | | | | Update specs for delayed background migration of stagesGrzegorz Bizon2018-01-061-4/+4
| * | | | | | | | | | | | | | | Update background stages migration timestampGrzegorz Bizon2018-01-064-4/+4
| * | | | | | | | | | | | | | | Fix Rubocop offenses in build status migrations :cop:Grzegorz Bizon2018-01-062-4/+2
| * | | | | | | | | | | | | | | Migrate a build stage completely in a background migrationGrzegorz Bizon2018-01-062-0/+115
| * | | | | | | | | | | | | | | Schedule full build stage migration in the backgroundGrzegorz Bizon2018-01-062-0/+63
* | | | | | | | | | | | | | | | Merge branch 'refactor-commit-show' into 'master'Phil Hughes2018-02-273-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-2722-26/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into refactor-commit-showClement Ho2018-02-26125-379/+343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove diff notes webpack entry pointClement Ho2018-02-263-3/+2
* | | | | | | | | | | | | | | | | | Merge branch 'ph-webpack-bundle-tags' into 'master'Filipa Lacerda2018-02-2711-34/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-27162-480/+557
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-2611-34/+25
* | | | | | | | | | | | | | | | | | | Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' i...Grzegorz Bizon2018-02-278-60/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-278-60/+107
* | | | | | | | | | | | | | | | | | | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-2712-24/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-2312-24/+81
* | | | | | | | | | | | | | | | | | | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-276-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-26125-379/+343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove commit_pipelines webpack entry pointClement Ho2018-02-266-5/+8
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '43315-gpg-popover' into 'master'Phil Hughes2018-02-273-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add missing class to parent element and remove extra CSS43315-gpg-popoverFilipa Lacerda2018-02-264-11/+3
| * | | | | | | | | | | | | | | | | | | [ci skip] Merge branch 'master' into 43315-gpg-popoverFilipa Lacerda2018-02-26145-565/+2310
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix gpg popover boxFilipa Lacerda2018-02-233-6/+11
* | | | | | | | | | | | | | | | | | | | | Merge branch '43275-improve-variables-validation-message' into 'master'Kamil Trzciński2018-02-277-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-messageMatija Čupić2018-02-234-4/+10
| * | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entryMatija Čupić2018-02-221-0/+5
| * | | | | | | | | | | | | | | | | | | | | Skip variables duplicates validator if variable is already a duplicateMatija Čupić2018-02-223-1/+4
| * | | | | | | | | | | | | | | | | | | | | Condition associated variable validation in Project and GroupMatija Čupić2018-02-222-2/+3
| * | | | | | | | | | | | | | | | | | | | | Do not validate individual Variables when saving Project/GroupMatija Čupić2018-02-222-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch '43261-fix-prometheus-installation' into 'master'Kamil Trzciński2018-02-272-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Change RBAC value to false on Prometheus values.yml43261-fix-prometheus-installationMayra Cabrera2018-02-262-0/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refactor-environments-folder' into 'master'Phil Hughes2018-02-274-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-26125-379/+343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove environments folder webpack entry pointClement Ho2018-02-264-5/+5
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-17' into 'master'Rémy Coutable2018-02-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | CONTRIBUTING.md: Use a proper example for stewardship labelCarlos Soriano Sánchez2018-02-241-3/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-issue-43631' into 'master'Stan Hu2018-02-272-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Adjust the API issues move spec to use project ID 0Stan Hu2018-02-262-4/+4
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '43532-error-on-admin-applications-prometheus-template' into 'ma...Stan Hu2018-02-265-26/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ...Mayra Cabrera2018-02-265-26/+77
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dispatcher-switch' into 'master'Jacob Schatz2018-02-2615-196/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Refactor wildcard dispatcher importsClement Ho2018-02-2615-196/+91
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '4536-move-ee-specific-javascripts-files-to' into 'master'Clement Ho2018-02-2699-112/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-2699-112/+110
|/ / / / / / / / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | | | | * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into profile...Constance Okoghenun2018-02-26189-911/+2849
| | | | | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |