summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'add_note_about_google_noto_font_support_by_default' into 'master'Clement Ho2018-08-161-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about Noto Color Emoji font support by default See merge request gitlab-org/gitlab-ce!21251
| * | | | | | | Add note about Noto Color Emoji font support by defaultAlexander Popov2018-08-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In modern Linux distros. Source: https://www.omgubuntu.co.uk/2018/06/use-emoji-linux-ubuntu-apps
* | | | | | | | Merge branch 'rouge_3.2.1' into 'master'Stan Hu2018-08-162-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Rouge to 3.2.1. Includes a critical fix for the Perl Lexer See merge request gitlab-org/gitlab-ce!21263
| * | | | | | | | Update Rouge to 3.2.1. Includes a critical fix for the Perl LexerDrew Blessing2018-08-162-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'emoji-cutoff-1px' into 'master'Annabel Gray2018-08-162-3/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 1px cutoff of emojis Closes #47913 See merge request gitlab-org/gitlab-ce!21180
| * | | | | | | | Fix 1px cutoff of emojisgfyoung2018-08-162-3/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/hangouts-introduced' into 'master'Marcia Ramos2018-08-161-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add when the hangouts integration was introduced See merge request gitlab-org/gitlab-ce!21257
| * | | | | | | | Add when the hangouts integration was introducedAchilleas Pipinellis2018-08-161-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'leipert-proper-gettext-parsing' into 'master'Mike Greiling2018-08-1613-51/+606
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend: Proper gettext extraction with gettext-extractor Closes #48864, #42839, and #47092 See merge request gitlab-org/gitlab-ce!19378
| * | | | | | | | Frontend: Proper gettext extraction with gettext-extractor🌴🇿🇦 Lukas Eipert (OOO until Summit)2018-08-1613-51/+606
|/ / / / / / / /
* | | | | | | | Merge branch ↵Mike Greiling2018-08-166-0/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable' into 'master' Resolve "Instance Statistics: ConvDev index intro banner is not dismissable" Closes #50312 See merge request gitlab-org/gitlab-ce!21211
| * | | | | | | | add changelog50312-instance-statistics-convdev-index-intro-banner-is-not-dismissableLuke Bennett2018-08-161-0/+5
| | | | | | | | |
| * | | | | | | | add test for convdev index user calloutLuke Bennett2018-08-141-0/+10
| | | | | | | | |
| * | | | | | | | Add test for usage ping js in cohorts_specLuke Bennett2018-08-141-0/+8
| | | | | | | | |
| * | | | | | | | Rename conv dev index show action to index action in js pages dirLuke Bennett2018-08-141-0/+0
| | | | | | | | |
| * | | | | | | | Move cohorts and conv dev index js to new pages locationLuke Bennett2018-08-143-0/+0
| | | | | | | | |
* | | | | | | | | Merge branch '49770-fixes-input-alignment-on-user-admin-form-with-errors' ↵Fatih Acet2018-08-163-15/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Admin > New user form > Error state > Inputs misaligned" Closes #49770 See merge request gitlab-org/gitlab-ce!21108
| * | | | | | | | | Fixes input alignment in user admin form with errors49770-fixes-input-alignment-on-user-admin-form-with-errorsJacopo2018-08-093-15/+35
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs/manifest-introduced' into 'master'Marcia Ramos2018-08-161-0/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add when manifest feature was introduced See merge request gitlab-org/gitlab-ce!21256
| * | | | | | | | | Add when manifest feature was introduceddocs/manifest-introducedAchilleas Pipinellis2018-08-161-0/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'improve-project-manifest-import-docs' into 'master'Achilleas Pipinellis2018-08-163-29/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project manifest import docs See merge request gitlab-org/gitlab-ce!21253
| * | | | | | | | | Improve project manifest import docsAchilleas Pipinellis2018-08-163-29/+36
|/ / / / / / / / /
* | | | | | | | | Merge branch 'zj-remove-repository-languages-feature-gate' into 'master'Nick Thomas2018-08-165-8/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature gates for Repository Languages Closes #50291 See merge request gitlab-org/gitlab-ce!21186
| * | | | | | | | | Remove feature gates for Repository LanguagesZeger-Jan van de Weg2018-08-165-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository languages feature got introduced through: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19480. This MR included feature flags to guard against performance regressions, which allowed GitLab to test it on gitlab.com before the customers would be exposed. .com worked out fine, as shown by our internal monitoring tools, which prompts feature gate removal. Given the docs weren't present yet, these were added too.
* | | | | | | | | | Merge branch ↵Nick Thomas2018-08-163-3/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49796-project-deletion-may-not-log-audit-events-during-group-deletion' into 'master' Resolve "Project deletion may not log audit events during group deletion" Closes #49796 See merge request gitlab-org/gitlab-ce!21162
| * | | | | | | | | | Fix: Project deletion may not log audit events during group deletion49796-project-deletion-may-not-log-audit-events-during-group-deletionValery Sizov2018-08-163-3/+20
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'gitlab-org/gitlab-ce#41738' into 'master'Fatih Acet2018-08-163-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix if-check See merge request gitlab-org/gitlab-ce!20640
| * | | | | | | | | | | Fix if-checkDicker Max2018-08-163-1/+15
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-kaniko-docs' into 'master'Achilleas Pipinellis2018-08-162-0/+61
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial kaniko documentation See merge request gitlab-org/gitlab-ce!21216
| * | | | | | | | | | | Initial kaniko documentationJoshua Lambert2018-08-162-0/+61
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-rake-command-to-migrate-locally-persisted-archived-traces' ↵Kamil Trzciński2018-08-165-34/+159
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add rake command to migrate archived traces from local storage to object storage Closes #50232 See merge request gitlab-org/gitlab-ce!21193
| * | | | | | | | | | | Add rake command to migrate archived traces from local storage to object storageShinya Maeda2018-08-165-34/+159
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'instance-statistics-docs' into 'master'Marcia Ramos2018-08-1616-71/+98
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instance statistics docs Closes #49976 See merge request gitlab-org/gitlab-ce!21099
| * | | | | | | | | | | Instance statistics docsLuke Bennett2018-08-1616-71/+98
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'add-ci_archive_traces_cron_worker-to-gitlab-yml' into 'master'Kamil Trzciński2018-08-162-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ci_archive_traces_cron_worker configuration to gitlab.yml.example See merge request gitlab-org/gitlab-ce!20583
| * | | | | | | | | | Add ci_archive_traces_cron_worker configuration to gitlab.yml.exampleShinya Maeda2018-08-162-0/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '50101-truncated-job-information' into 'master'Phil Hughes2018-08-164-0/+379
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a vue component for the top bar with controllers in job log view See merge request gitlab-org/gitlab-ce!21164
| * | | | | | | | | | Creates a vue component for the top bar with controllers in job log viewFilipa Lacerda2018-08-164-0/+379
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '50193-feature-flag-force-enable-auto-devops' into 'master'Kamil Trzciński2018-08-167-28/+54
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable Auto DevOps instance-wide on GitLab.com" Closes #50193 See merge request gitlab-org/gitlab-ce!21136
| * | | | | | | | | Resolve "Enable Auto DevOps instance-wide on GitLab.com"Dylan Griffith2018-08-167-28/+54
|/ / / / / / / / /
* | | | | | | | | Merge branch 'workhorse-6.0.0' into 'master'Douwe Maan2018-08-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 6.0.0 See merge request gitlab-org/gitlab-ce!21239
| * | | | | | | | | Use gitlab-workhorse 6.0.0workhorse-6.0.0Jacob Vosmaer2018-08-161-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '50101-empty-state-component' into 'master'Phil Hughes2018-08-163-0/+171
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates empty state component for job log view See merge request gitlab-org/gitlab-ce!21195
| * | | | | | | | | | Creates empty state component for job log viewFilipa Lacerda2018-08-163-0/+171
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ide-job-top-bar-ui-polish' into 'master'Filipa Lacerda2018-08-162-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved padding of top bar in IDE job trace panel Closes #48059 See merge request gitlab-org/gitlab-ce!21222
| * | | | | | | | | | Improved padding of top bar in IDE job trace panelide-job-top-bar-ui-polishPhil Hughes2018-08-152-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #48059
* | | | | | | | | | | Merge branch 'docs-processes' into 'master'Marcia Ramos2018-08-168-72/+509
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation process at GitLab Closes #46843 See merge request gitlab-org/gitlab-ce!19902
| * | | | | | | | | | Documentation process at GitLabMarcia Ramos2018-08-168-72/+509
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'zj-remove-flags-find-all-brances' into 'master'50326-ocd-pipelineSean McGivern2018-08-161-28/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature flag for FindAllRemoteBranches Closes gitaly#1243 See merge request gitlab-org/gitlab-ce!21234
| * | | | | | | | | | Remove feature flag for FindAllRemoteBranchesZeger-Jan van de Weg2018-08-161-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acceptance testing done through: https://gitlab.com/gitlab-org/gitaly/issues/1312 Relatively short AT period, but given its not a hard RPC, nor anything funky is going on, I felt that this was decent enough to remove the feature flag. Closes https://gitlab.com/gitlab-org/gitaly/issues/1243