delta/gitlab/gitlab-ce.git, branch nathan.jones/gitlab-ce-patch-24 gitlab.com: gitlab-org/gitlab-ce.git Update index.md to describe leaving out the host in prometheus['listen_address'] to allow public access. 2018-04-05T16:38:29+00:00 Nathan Jones nathan.jones@ironmail.org 2017-07-10T23:33:08+00:00 33c163b347ca37ae91240be40a05c881c89c7135 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch '44978-consider-removing-rubocop-and-eslint-from-codeclimate-yml' into 'master' 2018-04-05T15:57:02+00:00 Robert Speicher robert@gitlab.com 2018-04-05T15:57:02+00:00 38bf19222487272ff301dcef7f16eb759f48d352 Resolve "Consider removing RuboCop and ESLint from `.codeclimate.yml`" Closes #44978 See merge request gitlab-org/gitlab-ce!18178 
Resolve "Consider removing RuboCop and ESLint from `.codeclimate.yml`"

Closes #44978

See merge request gitlab-org/gitlab-ce!18178
 Merge branch 'pages-0-8-0' into 'master' 2018-04-05T15:29:01+00:00 Robert Speicher robert@gitlab.com 2018-04-05T15:29:01+00:00 96d251bb29e0330ba5355a4668f7ac7b0a38139f Update GitLab Pages See merge request gitlab-org/gitlab-ce!18203 
Update GitLab Pages

See merge request gitlab-org/gitlab-ce!18203
 Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master' 2018-04-05T15:24:02+00:00 Clement Ho clemmakesapps@gmail.com 2018-04-05T15:24:02+00:00 93869c63bc702bc5ed513030df8acbe28bedd60d Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request Closes #44870 See merge request gitlab-org/gitlab-ce!18120 
Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request

Closes #44870

See merge request gitlab-org/gitlab-ce!18120
 Merge branch 'ide-diff-inline' into 'master' 2018-04-05T15:23:00+00:00 Filipa Lacerda filipa@gitlab.com 2018-04-05T15:23:00+00:00 0c60e781c02d13ff6e5c2253ad722ffa6658c63e Change IDE diff view responsively Closes #44305 See merge request gitlab-org/gitlab-ce!18049 
Change IDE diff view responsively

Closes #44305

See merge request gitlab-org/gitlab-ce!18049
 Merge branch '43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries' into 'master' 2018-04-05T15:21:24+00:00 Douwe Maan douwe@gitlab.com 2018-04-05T15:21:24+00:00 2693edc4fe32fc51e966fe939a890edaa0042671 Resolve "Controller Projects::IssuesController#show executes more than 100 SQL queries" Closes #43098 See merge request gitlab-org/gitlab-ce!17986 
Resolve "Controller Projects::IssuesController#show executes more than 100 SQL queries"

Closes #43098

See merge request gitlab-org/gitlab-ce!17986
 Merge branch 'bvl-override-import-params' into 'master' 2018-04-05T15:18:49+00:00 Douwe Maan douwe@gitlab.com 2018-04-05T15:18:49+00:00 082bf1c6ee97aefc9c53e7462cf870ce8ce0ad2b Allow passing params to import API to override project attributes Closes gitlab-ee#4788 See merge request gitlab-org/gitlab-ce!18086 
Allow passing params to import API to override project attributes

Closes gitlab-ee#4788

See merge request gitlab-org/gitlab-ce!18086
 Update GitLab Pages 2018-04-05T14:46:48+00:00 Nick Thomas nick@gitlab.com 2018-04-05T14:41:28+00:00 7f408b8dd5959f82a9f681fc0adc53918b61fbc8 






Don't export `Project#description_html`
2018-04-05T13:48:41+00:00

Bob Van Landuyt
bob@vanlanduyt.co

2018-04-05T10:13:10+00:00

902cec12b5b531434ccf7ecf6df22ddb4249c253

Since we can regenerate `description_html` from the `description`, we
should not export it. This avoids some complexity when overriding the
description during an import/export where we would need to invalidate
this cached field.

Now we refresh the markdown cache after the import





Since we can regenerate `description_html` from the `description`, we
should not export it. This avoids some complexity when overriding the
description during an import/export where we would need to invalidate
this cached field.

Now we refresh the markdown cache after the import







Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into 'master'
2018-04-05T13:09:34+00:00

Kamil Trzciński
ayufan@ayufan.eu

2018-04-05T13:09:34+00:00

b2a7faa5a9223811884676bb1004f97fb8a18a54

Use chronic duration attribute for project build timeout

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




Use chronic duration attribute for project build timeout

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