summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* reserve name for upstream availability health checksjjn-availability-pathJohn Northrup2018-02-221-0/+1
|
* Merge branch 'mk-improve-background-migration-specs' into 'master'Stan Hu2018-02-219-518/+706
|\ | | | | | | | | Improve background migration specs See merge request gitlab-org/gitlab-ce!17162
| * Use convenient Rails helpermk-improve-background-migration-specsMichael Kozono2018-02-211-1/+1
| |
| * Prefer `table` helper in migration specsMichael Kozono2018-02-201-1/+1
| |
| * Move TrackUntrackedUploadsHelpersMichael Kozono2018-02-206-132/+134
| | | | | | | | into MigrationsHelpers namespace just for organization.
| * Explicitly reference redefined modelsMichael Kozono2018-02-204-413/+411
| | | | | | | | And move UntrackedFile into PopulateUntrackedUploadsDependencies, and move its spec into its own file.
| * Make :migration specs a little more robustMichael Kozono2018-02-161-0/+16
| | | | | | | | E.g. https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/52873034
| * Remove more BG migration spec dependenciesMichael Kozono2018-02-163-17/+26
| | | | | | | | For the `PrepareUntrackedUploads` spec.
| * Remove codebase dependencies from a BG migrationMichael Kozono2018-02-164-112/+275
| | | | | | | | Specifically, `PopulateUntrackedUploads` and its spec.
* | Merge branch 'dispatcher-import-batch-1' into 'master'Jacob Schatz2018-02-2112-80/+20
|\ \ | | | | | | | | | | | | Use dynamic imports in dispatcher See merge request gitlab-org/gitlab-ce!17273
| * | Use dynamic imports in dispatcherClement Ho2018-02-2112-80/+20
| | |
* | | Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master'Marcia Ramos2018-02-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Improve link for CI environment variable, wording. See merge request gitlab-org/gitlab-ce!17252
| * | | Improve link for CI environment variable, wording.minor-improvement-to-k8s-monitoring-docsJoshua Lambert2018-02-211-2/+2
| | | |
* | | | Merge branch 'rest-of-dispatcher' into 'master'Clement Ho2018-02-2154-338/+319
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Rest of Dispatcher Refactor See merge request gitlab-org/gitlab-ce!16659
| * | | Rest of Dispatcher RefactorJacob Schatz2018-02-2154-338/+319
|/ / /
* | | Merge branch 'dispatcher-import-project' into 'master'Jacob Schatz2018-02-2112-75/+39
|\ \ \ | | | | | | | | | | | | | | | | Use dynamic imports for project dispatcher paths See merge request gitlab-org/gitlab-ce!17270
| * | | Use dynamic imports for project dispatcher pathsClement Ho2018-02-2112-75/+39
|/ / /
* | | Merge branch 'update-browser-perf-testing-example-doc' into 'master'Marcia Ramos2018-02-211-4/+14
|\ \ \ | | | | | | | | | | | | | | | | Update Browser Performance Testing Example See merge request gitlab-org/gitlab-ce!17249
| * | | Fix linksupdate-browser-perf-testing-example-docJoshua Lambert2018-02-201-1/+1
| | | |
| * | | Additional updatesJoshua Lambert2018-02-201-3/+6
| | | |
| * | | Doc UpdateJoshua Lambert2018-02-201-4/+11
| | | |
* | | | Merge branch 'ad-inline-doc-to-codequality-job' into 'master'Dmitriy Zaporozhets2018-02-212-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Optimize and improve the inline documentation for the codequality job See merge request gitlab-org/gitlab-ce!17265
| * | | | Optimize and improve the inline documentation for the codequality jobRémy Coutable2018-02-212-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'feature/#2848-display-time-tracking-totals-milestone-page' ↵Clement Ho2018-02-218-22/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' #28481: Display time tracking totals on milestone page Closes #28481 See merge request gitlab-org/gitlab-ce!16753
| * | | | | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-218-22/+62
|/ / / / /
* | | | | Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master'Rémy Coutable2018-02-217-8/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Gem Update] update toml-rb to 1.0.0" Closes #36847 See merge request gitlab-org/gitlab-ce!17259
| * | | | | 36847 - update toml-rb to 1.0.0Ken2018-02-217-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36847 - add changelog
* | | | | | Merge branch 'add-pagination-commit-diffs' into 'master'Robert Speicher2018-02-213-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing pagination on the commit diff endpoint Closes #43370 See merge request gitlab-org/gitlab-ce!17203
| * | | | | | Add missing pagination on the commit diff endpointMaxime Roussin-Belanger2018-02-193-1/+10
| | | | | | |
* | | | | | | Merge branch 'tc-info-version-check' into 'master'Sean McGivern2018-02-213-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more transparent about the version check See merge request gitlab-org/gitlab-ce!17257
| * | | | | | | Add more info about data collected when version check is enabledtc-info-version-checkToon Claes2018-02-213-3/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix/new-project-path-input-overlapping' into 'master'Clement Ho2018-02-213-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new project path input overlapping, height and radius #41811 Closes #41811 See merge request gitlab-org/gitlab-ce!16755
| * | | | | | | Fix new project path input overlappingGeorge Tsiolis2018-02-143-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Max-width and height
* | | | | | | | Merge branch 'fix/change-event-body-label-font-size' into 'master'Clement Ho2018-02-216-8/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply new default and inline label design #34725 Closes #34725 See merge request gitlab-org/gitlab-ce!16956
| * | | | | | | | Apply new default and inline label designGeorge Tsiolis2018-02-156-8/+15
| | | | | | | | |
* | | | | | | | | Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'Robert Speicher2018-02-215-7/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update to github-linguist 5.3.x" Closes #26039 See merge request gitlab-org/gitlab-ce!17241
| * | | | | | | | | 26039 - update github-linguist to 5.3.3 versionKen2018-02-215-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26039 - add merge request id 26039 change due to lingust source file updates
* | | | | | | | | | Merge branch 'bug/misleading-ci-yaml-documentation' into 'master'Rémy Coutable2018-02-211-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an invalid documentation for the .gitlab-ci.yml cache:key See merge request gitlab-org/gitlab-ce!17047
| * | | | | | | | | | Fixes an invalid documentation for the .gitlab-ci.yml cache:keyLars Kumbier2018-02-101-5/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Rémy Coutable2018-02-212-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified' into 'master' Resolve "API: PUT /projects/:id fails when only ci_config_path is specified" Closes #42509 See merge request gitlab-org/gitlab-ce!17105
| * | | | | | | | | | | Resolve "API: PUT /projects/:id fails when only ci_config_path is specified"Kárpáti László2018-02-212-0/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '35418-remove-underline-for-avatar' into 'master'Clement Ho2018-02-213-1/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove underline for avatar" Closes #35418 See merge request gitlab-org/gitlab-ce!17219
| * | | | | | | | | | | 35418 - remove avatar underlineKen2018-02-203-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35418 - update changelog
* | | | | | | | | | | | Merge branch 'patch-19' into 'master'Rémy Coutable2018-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix docs link See merge request gitlab-org/gitlab-ce!17195
| * | | | | | | | | | | | fix docs linkBen Bodenmiller2018-02-211-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sh-guard-against-nil-sidekiq-metrics-server' into 'master'Robert Speicher2018-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against nil Sidekiq metrics server Closes #41351 See merge request gitlab-org/gitlab-ce!17254
| * | | | | | | | | | | | Guard against nil Sidekiq metrics serversh-guard-against-nil-sidekiq-metrics-serverStan Hu2018-02-201-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #41351
* | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-02-213-5/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40668-pages-domain-api-returns-404-when-using-a-specific-domain' into 'master' Resolve "Pages Domain API returns 404 when using a specific domain" Closes #40668 See merge request gitlab-org/gitlab-ce!17206
| * | | | | | | | | | | | Fix get a single pages domain when project path contains a periodTravis Miller2018-02-193-5/+23
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emoji.codes is now emojicopy.com See merge request gitlab-org/gitlab-ce!17212