summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* set margin for user status emoji globally49644-make-margin-of-user-status-emoji-consistentMartin Wortschack2018-08-264-23/+10
* resolves MR discussions:Martin Wortschack2018-08-214-6/+6
* keeps margin for user status emojis consistentMartin Wortschack2018-08-175-2/+33
* Merge branch 'rails5-verbose-query-logs' into 'master'Robert Speicher2018-08-162-1/+8
|\
| * [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 defaultAlexander Popov2018-08-161-2/+13
* | | 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 LexerDrew Blessing2018-08-162-1/+6
* | | | Merge branch 'emoji-cutoff-1px' into 'master'Annabel Gray2018-08-162-3/+5
|\ \ \ \ | |/ / / |/| | |
| * | | 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 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🌴🇿🇦 Lukas Eipert (OOO until Summit)2018-08-1613-51/+606
|/ / / /
* | | | Merge branch '50312-instance-statistics-convdev-index-intro-banner-is-not-dis...Mike Greiling2018-08-166-0/+23
|\ \ \ \
| * | | | 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' int...Fatih Acet2018-08-163-15/+35
|\ \ \ \ \
| * | | | | 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 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 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 LanguagesZeger-Jan van de Weg2018-08-165-8/+11
* | | | | | Merge branch '49796-project-deletion-may-not-log-audit-events-during-group-de...Nick Thomas2018-08-163-3/+20
|\ \ \ \ \ \
| * | | | | | 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-checkDicker Max2018-08-163-1/+15
|/ / / / / / /
* | | | | | | Merge branch 'add-kaniko-docs' into 'master'Achilleas Pipinellis2018-08-162-0/+61
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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 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.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 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"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.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 viewFilipa Lacerda2018-08-163-0/+171
|/ / / / / / /