summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Fix: Project deletion may not log audit events during user deletionValery Sizov2018-08-175-26/+35
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'qa-314-project-tests-cleanup' into 'master'Douwe Maan2018-08-174-114/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some duplicate tests and fix some typos See merge request gitlab-org/gitlab-ce!21246
| * | | | | | | | | | Remove some duplicate tests and fix some typosqa-314-project-tests-cleanupsliaquat2018-08-164-114/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-user-update-branch' into 'master'Douwe Maan2018-08-171-8/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature flags for UserUpdateBranch Closes gitaly#1246 and gitaly#1310 See merge request gitlab-org/gitlab-ce!21238
| * | | | | | | | | | Remove feature flags for UserUpdateBranchZeger-Jan van de Weg2018-08-161-8/+2
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been tested on .com. So far no errors have been seen. Closes https://gitlab.com/gitlab-org/gitaly/issues/1310 Closes https://gitlab.com/gitlab-org/gitaly/issues/1246
* | | | | | | | | | Merge branch 'ide-live-preview-merge-requests' into 'master'Filipa Lacerda2018-08-173-9/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Web IDE live preview crashing when loading from merge request Closes #50392 See merge request gitlab-org/gitlab-ce!21252
| * | | | | | | | | fixed karma specide-live-preview-merge-requestsPhil Hughes2018-08-161-6/+14
| | | | | | | | | |
| * | | | | | | | | Fixed Web IDE live preview crashing when loading from merge requestPhil Hughes2018-08-162-3/+5
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mg-keep-project-settings-expanded' into 'master'Filipa Lacerda2018-08-171-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mirror settings anchor See merge request gitlab-org/gitlab-ce!21261
| * | | | | | | | | port of EE changesmg-keep-project-settings-expandedMike Greiling2018-08-161-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '50101-commit-block' into 'master'Phil Hughes2018-08-173-0/+142
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates Vue component for commit block in job log view See merge request gitlab-org/gitlab-ce!21249
| * | | | | | | | | Creates Vue commit component for job log page50101-commit-blockFilipa Lacerda2018-08-163-0/+142
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '50101-trigger' into 'master'Phil Hughes2018-08-174-0/+161
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Creates Vue component for trigger variables block in job log page See merge request gitlab-org/gitlab-ce!21244
| * | | | | | | | Creates Vue component for trigger variables block in job log page50101-triggerFilipa Lacerda2018-08-164-0/+161
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate pot files Remove `#` Remove empty lines
* | | | | | | | Merge branch 'docs-update-pages-ip-gitlabcom' into 'master'Achilleas Pipinellis2018-08-173-10/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update Pages IP address change + other DNS updates See merge request gitlab-org/gitlab-ce!21259
| * | | | | | | | Docs: update Pages IP address change + other DNS updatesMarcia Ramos2018-08-173-10/+30
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-11' into 'master'Achilleas Pipinellis2018-08-173-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: ci/yaml expire_in: the value is in seconds See merge request gitlab-org/gitlab-ce!20983
| * | | | | | | | doc: ci/yaml expire_in: the value is in secondsElan RuusamΓ€e2018-08-173-3/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'rails5-verbose-query-logs' into 'master'Robert Speicher2018-08-162-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: Enable verbose query logs See merge request gitlab-org/gitlab-ce!21231
| * | | | | | | | [ci skip] Change changelog type to otherJasper Maes2018-08-161-1/+1
| | | | | | | | |
| * | | | | | | | Rails5: Enable verbose query logsJasper Maes2018-08-162-1/+8
| | | | | | | | |
* | | | | | | | | 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
View Lorry Controller Status