delta/gitlab/gitlab-ce.git/config, branch 2018-06-07-code-freeze gitlab.com: gitlab-org/gitlab-ce.git Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into 'master' 2018-06-08T06:53:54+00:00 Tim Zallmann tzallmann@gitlab.com 2018-06-08T06:53:54+00:00 9d285f1fef0ca66da16b7c0ba42f50071dab73ab Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin" Closes #44331 See merge request gitlab-org/gitlab-ce!17813 
Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin"

Closes #44331

See merge request gitlab-org/gitlab-ce!17813
 approve @webassemblyjs packages (MIT license) 2018-06-08T05:31:44+00:00 Mike Greiling mike@pixelcog.com 2018-06-08T05:31:44+00:00 1edf0a8aa719aab9cf8782ed1ca743a8d7b57ae7 






add monaco-editor-webpack-plugin and update webpack config
2018-06-07T21:35:34+00:00

Mike Greiling
mike@pixelcog.com

2018-06-06T08:25:13+00:00

6d96b9dd6be8d27d3030e7a6de08ec3ba419643e












Merge branch 'jl-update-error-rate-to-percent' into 'master'
2018-06-07T21:31:00+00:00

Mike Greiling
mike@pixelcog.com

2018-06-07T21:31:00+00:00

58ae01cbdd0c78463673b8734bf457648d453240

Update NGINX error rate to a percentage

See merge request gitlab-org/gitlab-ce!19471




Update NGINX error rate to a percentage

See merge request gitlab-org/gitlab-ce!19471






Merge branch 'feature/customizable-favicon' into 'master'
2018-06-07T16:54:41+00:00

Douwe Maan
douwe@gitlab.com

2018-06-07T16:54:41+00:00

290ca339adc952bcd939d1782af95f90d3b88716

Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497




Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497






Merge branch '44790-disabled-emails-logging' into 'master'
2018-06-07T11:44:45+00:00

Sean McGivern
sean@mcgivern.me.uk

2018-06-07T11:44:45+00:00

21469fa6b7364155c955fbef48880eb32419361d

Stop logging email information when emails are disabled

Closes #44790

See merge request gitlab-org/gitlab-ce!18521




Stop logging email information when emails are disabled

Closes #44790

See merge request gitlab-org/gitlab-ce!18521






Merge branch '45505-lograge_formatter_encoding' into 'master'
2018-06-07T09:26:24+00:00

Kamil Trzciński
ayufan@ayufan.eu

2018-06-07T09:26:24+00:00

bc5fd64142f0d9640b68989e1327b8a6bb10c8c8

Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter

Closes #45505

See merge request gitlab-org/gitlab-ce!19244




Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter

Closes #45505

See merge request gitlab-org/gitlab-ce!19244






Merge branch 'sh-log-422-responses' into 'master'
2018-06-07T08:11:30+00:00

Sean McGivern
sean@mcgivern.me.uk

2018-06-07T08:11:30+00:00

5ebc461829403a6e0fbf596255bbf6e505c42648

Log response body to production_json.log when a controller responds with a 422 status

See merge request gitlab-org/gitlab-ce!19473




Log response body to production_json.log when a controller responds with a 422 status

See merge request gitlab-org/gitlab-ce!19473






Resolve "Introduce new navigation themes in GitLab 11.0"
2018-06-07T07:37:02+00:00

Annabel Gray
annabel.m.gray@gmail.com

2018-06-07T07:37:02+00:00

164dbc6b77558e29fd9a1553048d314457dc6990












Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and filter out file content from logs
2018-06-06T20:25:20+00:00

Imre Farkas
ifarkas@gitlab.com

2018-05-30T10:12:42+00:00

854c9636ec6aabd8941b31f0f2aa4e89c9c072ce